rasa-pro 3.11.0__py3-none-any.whl → 3.11.0a2__py3-none-any.whl

rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py

@@ -16,13 +16,11 @@ from rasa.dialogue_understanding.commands import (
     KnowledgeAnswerCommand,
     ClarifyCommand,
     CannotHandleCommand,
-    RepeatBotMessagesCommand,
 )
 from rasa.dialogue_understanding.generator.constants import (
     LLM_CONFIG_KEY,
     USER_INPUT_CONFIG_KEY,
     FLOW_RETRIEVAL_KEY,
-    DEFAULT_LLM_CONFIG,
 )
 from rasa.dialogue_understanding.generator.flow_retrieval import (
     FlowRetrieval,
@@ -39,7 +37,6 @@ from rasa.shared.constants import (
     ROUTE_TO_CALM_SLOT,
     PROMPT_CONFIG_KEY,
     PROMPT_TEMPLATE_CONFIG_KEY,
-    EMBEDDINGS_CONFIG_KEY,
 )
 from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
@@ -51,9 +48,7 @@ from rasa.shared.utils.llm import (
     get_prompt_template,
     tracker_as_readable_transcript,
     sanitize_message_for_prompt,
-    resolve_model_client_config,
 )
-from rasa.utils.beta import ensure_beta_feature_is_enabled, BetaNotEnabledException
 from rasa.utils.log_utils import log_llm
 
 COMMAND_PROMPT_FILE_NAME = "command_prompt.jinja2"
@@ -62,7 +57,6 @@ DEFAULT_COMMAND_PROMPT_TEMPLATE = importlib.resources.read_text(
     "rasa.dialogue_understanding.generator.single_step",
     "command_prompt_template.jinja2",
 )
-SINGLE_STEP_LLM_COMMAND_GENERATOR_CONFIG_FILE = "config.json"
 
 structlogger = structlog.get_logger()
 
@@ -113,7 +107,6 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
         )
 
         self.trace_prompt_tokens = self.config.get("trace_prompt_tokens", False)
-        self.repeat_command_enabled = self.is_repeat_command_enabled()
 
     ### Implementations of LLMBasedCommandGenerator parent
     @staticmethod
@@ -137,21 +130,10 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
         **kwargs: Any,
     ) -> "SingleStepLLMCommandGenerator":
         """Loads trained component (see parent class for full docstring)."""
-
-        # Perform health check of the LLM API endpoint
-        llm_config = resolve_model_client_config(config.get(LLM_CONFIG_KEY, {}))
-        cls.perform_llm_health_check(
-            llm_config,
-            DEFAULT_LLM_CONFIG,
-            "single_step_llm_command_generator.load",
-            SingleStepLLMCommandGenerator.__name__,
-        )
-
         # load prompt template from the model storage.
         prompt_template = cls.load_prompt_template_from_model_storage(
             model_storage, resource, COMMAND_PROMPT_FILE_NAME
         )
-
         # init base command generator
         command_generator = cls(config, model_storage, resource, prompt_template)
         # load flow retrieval if enabled
@@ -159,29 +141,18 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
             command_generator.flow_retrieval = cls.load_flow_retrival(
                 command_generator.config, model_storage, resource
             )
-
         return command_generator
 
     def persist(self) -> None:
         """Persist this component to disk for future loading."""
-        self._persist_prompt_template()
-        self._persist_config()
-        if self.flow_retrieval is not None:
-            self.flow_retrieval.persist()
-
-    def _persist_prompt_template(self) -> None:
-        """Persist prompt template for future loading."""
+        # persist prompt template
         with self._model_storage.write_to(self._resource) as path:
             rasa.shared.utils.io.write_text_file(
                 self.prompt_template, path / COMMAND_PROMPT_FILE_NAME
             )
-
-    def _persist_config(self) -> None:
-        """Persist config as a source of truth for resolved clients."""
-        with self._model_storage.write_to(self._resource) as path:
-            rasa.shared.utils.io.dump_obj_as_json_to_file(
-                path / SINGLE_STEP_LLM_COMMAND_GENERATOR_CONFIG_FILE, self.config
-            )
+        # persist flow retrieval
+        if self.flow_retrieval is not None:
+            self.flow_retrieval.persist()
 
     async def predict_commands(
         self,
@@ -214,12 +185,6 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
 
         if not commands:
             # no commands are parsed or there's an invalid command
-            structlogger.warning(
-                "single_step_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."
-                "Returning a CannotHandleCommand instead.",
-            )
             commands = [CannotHandleCommand()]
 
         if tracker.has_coexistence_routing_slot:
@@ -320,17 +285,14 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
 
         commands: List[Command] = []
 
-        slot_set_re = re.compile(
-            r"""SetSlot\(['"]?([a-zA-Z_][a-zA-Z0-9_-]*)['"]?, ?['"]?(.*)['"]?\)"""
-        )
-        start_flow_re = re.compile(r"StartFlow\(['\"]?([a-zA-Z0-9_-]+)['\"]?\)")
+        slot_set_re = re.compile(r"""SetSlot\(([a-zA-Z_][a-zA-Z0-9_-]*?), ?(.*)\)""")
+        start_flow_re = re.compile(r"StartFlow\(([a-zA-Z0-9_-]+?)\)")
         cancel_flow_re = re.compile(r"CancelFlow\(\)")
         chitchat_re = re.compile(r"ChitChat\(\)")
         skip_question_re = re.compile(r"SkipQuestion\(\)")
         knowledge_re = re.compile(r"SearchAndReply\(\)")
         humand_handoff_re = re.compile(r"HumanHandoff\(\)")
-        clarify_re = re.compile(r"Clarify\(([\"\'a-zA-Z0-9_, ]+)\)")
-        repeat_re = re.compile(r"RepeatLastBotMessages\(\)")
+        clarify_re = re.compile(r"Clarify\(([a-zA-Z0-9_, ]+)\)")
 
         for action in actions.strip().splitlines():
             if match := slot_set_re.search(action):
@@ -357,40 +319,21 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
                 commands.append(KnowledgeAnswerCommand())
             elif humand_handoff_re.search(action):
                 commands.append(HumanHandoffCommand())
-            elif repeat_re.search(action):
-                commands.append(RepeatBotMessagesCommand())
             elif match := clarify_re.search(action):
                 options = sorted([opt.strip() for opt in match.group(1).split(",")])
-                # Remove surrounding quotes if present
-                cleaned_options = []
-                for flow in options:
-                    if (flow.startswith('"') and flow.endswith('"')) or (
-                        flow.startswith("'") and flow.endswith("'")
-                    ):
-                        cleaned_options.append(flow[1:-1])
-                    else:
-                        cleaned_options.append(flow)
-                # check if flow is valid
                 valid_options = [
-                    flow for flow in cleaned_options if flow in flows.user_flow_ids
+                    flow for flow in options if flow in flows.user_flow_ids
                 ]
                 if len(set(valid_options)) == 1:
                     commands.extend(cls.start_flow_by_name(valid_options[0], flows))
                 elif len(valid_options) > 1:
                     commands.append(ClarifyCommand(valid_options))
 
-        if not commands:
-            structlogger.debug(
-                "single_step_llm_command_generator.parse_commands",
-                message="No commands were parsed from the LLM actions.",
-                actions=actions,
-            )
-
         return commands
 
     @classmethod
     def fingerprint_addon(cls: Any, config: Dict[str, Any]) -> Optional[str]:
-        """Add a fingerprint for the graph."""
+        """Add a fingerprint of the knowledge base for the graph."""
         config_prompt = (
             config.get(PROMPT_CONFIG_KEY)
             or config.get(PROMPT_TEMPLATE_CONFIG_KEY)
@@ -400,16 +343,7 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
             config_prompt,
             DEFAULT_COMMAND_PROMPT_TEMPLATE,
         )
-        llm_config = resolve_model_client_config(
-            config.get(LLM_CONFIG_KEY), SingleStepLLMCommandGenerator.__name__
-        )
-        embedding_config = resolve_model_client_config(
-            config.get(FLOW_RETRIEVAL_KEY, {}).get(EMBEDDINGS_CONFIG_KEY),
-            FlowRetrieval.__name__,
-        )
-        return deep_container_fingerprint(
-            [prompt_template, llm_config, embedding_config]
-        )
+        return deep_container_fingerprint(prompt_template)
 
     ### Helper methods
     def render_template(
@@ -459,20 +393,6 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
             "current_slot": current_slot,
             "current_slot_description": current_slot_description,
             "user_message": latest_user_message,
-            "is_repeat_command_enabled": self.repeat_command_enabled,
         }
 
         return self.compile_template(self.prompt_template).render(**inputs)
-
-    def is_repeat_command_enabled(self) -> bool:
-        """Check for feature flag"""
-        RASA_PRO_BETA_REPEAT_COMMAND_ENV_VAR_NAME = "RASA_PRO_BETA_REPEAT_COMMAND"
-        try:
-            ensure_beta_feature_is_enabled(
-                "Repeat Command",
-                env_flag=RASA_PRO_BETA_REPEAT_COMMAND_ENV_VAR_NAME,
-            )
-        except BetaNotEnabledException:
-            return False
-
-        return True

rasa/dialogue_understanding/patterns/default_flows_for_patterns.yml

@@ -4,11 +4,6 @@ responses:
   utter_ask_rephrase:
     - text: I’m sorry I am unable to understand you, could you please rephrase?
 
-  utter_ask_still_there:
-    - text: "Hello, are you still there?"
-      metadata:
-        rephrase: True
-
   utter_boolean_slot_rejection:
     - text: "Sorry, the value you provided, `{{value}}`, is not valid. Please respond with a valid value."
       metadata:
@@ -80,11 +75,6 @@ responses:
       metadata:
         rephrase: True
 
-  utter_inform_hangup:
-    - text: It seems you are not there anymore. I will hang up shortly.
-      metadata:
-        rephrase: True
-
   utter_internal_error_rasa:
     - text: Sorry, I am having trouble with that. Please try again in a few minutes.
 
@@ -111,15 +101,6 @@ slots:
     type: bool
     mappings:
       - type: from_llm
-  silence_timeout:
-    type: float
-    initial_value: 6.0
-    max_value: 1000000
-  consecutive_silence_timeouts:
-    type: float
-    initial_value: 0.0
-    max_value: 1000000
-
 
 flows:
   pattern_cancel_flow:
@@ -236,11 +217,6 @@ flows:
               - action: utter_internal_error_rasa
                 next: END
 
-  pattern_repeat_bot_messages:
-    description: Voice conversation repair pattern to repeat bot messages
-    name: pattern repeat bot messages
-    steps:
-      - action: action_repeat_bot_messages
 
   pattern_restart:
     description: Flow for restarting the conversation
@@ -270,32 +246,3 @@ flows:
     name: pattern skip question
     steps:
       - action: utter_skip_question_answer
-
-  pattern_user_silence:
-    description: Reacting to user silence in voice bots
-    name: pattern react to silence
-    nlu_trigger:
-      - intent: silence_timeout
-    persisted_slots:
-      - consecutive_silence_timeouts
-    steps:
-      - noop: true
-        next:
-          - if: "slots.consecutive_silence_timeouts = 0.0"
-            then:
-              - set_slots:
-                  - consecutive_silence_timeouts: 1.0
-              - action: action_repeat_bot_messages
-                next: END
-          - if: "slots.consecutive_silence_timeouts = 1.0"
-            then:
-              - set_slots:
-                  - consecutive_silence_timeouts: 2.0
-              - action: utter_ask_still_there
-                next: END
-          - if: "slots.consecutive_silence_timeouts > 1.0"
-            then:
-              - action: utter_inform_hangup
-              - action: action_hangup
-                next: END
-          - else: END

rasa/dialogue_understanding/processor/command_processor.py

@@ -8,7 +8,6 @@ from rasa.dialogue_understanding.commands import (
     Command,
     CorrectSlotsCommand,
     CorrectedSlot,
-    RepeatBotMessagesCommand,
     SetSlotCommand,
     StartFlowCommand,
     FreeFormAnswerCommand,
@@ -423,9 +422,6 @@ def clean_up_commands(
     elif not tracker.has_coexistence_routing_slot and len(clean_commands) > 1:
         clean_commands = filter_cannot_handle_command_for_skipped_slots(clean_commands)
 
-    clean_commands = ensure_max_number_of_command_type(
-        clean_commands, RepeatBotMessagesCommand, 1
-    )
     structlogger.debug(
         "command_processor.clean_up_commands.final_commands",
         command=clean_commands,
@@ -434,22 +430,6 @@ def clean_up_commands(
     return clean_commands
 
 
-def ensure_max_number_of_command_type(
-    commands: List[Command], command_type: Type[Command], n: int
-) -> List[Command]:
-    """Ensures that for a given command type only the first n stay in the list."""
-    filtered: List[Command] = []
-    count = 0
-    for c in commands:
-        if isinstance(c, command_type):
-            if count >= n:
-                continue
-            else:
-                count += 1
-        filtered.append(c)
-    return filtered
-
-
 def clean_up_clarify_command(
     commands_so_far: List[Command],
     all_commands: List[Command],
@@ -472,7 +452,7 @@ def clean_up_clarify_command(
         if not (isinstance(c, SetSlotCommand) and c.name == ROUTE_TO_CALM_SLOT)
     ]
 
-    # if all commands are clarify commands, add the first one only, otherwise add none
+    # if there are multiple clarify commands, do add the first one
     if all(
         isinstance(c, ClarifyCommand) for c in commands_without_route_to_calm_set_slot
     ):

rasa/e2e_test/assertions.py

@@ -71,7 +71,6 @@ class AssertionType(Enum):
     SLOT_WAS_SET = "slot_was_set"
     SLOT_WAS_NOT_SET = "slot_was_not_set"
     BOT_UTTERED = "bot_uttered"
-    BOT_DID_NOT_UTTER = "bot_did_not_utter"
     GENERATIVE_RESPONSE_IS_RELEVANT = "generative_response_is_relevant"
     GENERATIVE_RESPONSE_IS_GROUNDED = "generative_response_is_grounded"
 
@@ -723,7 +722,6 @@ class BotUtteredAssertion(Assertion):
     ) -> Tuple[Optional[AssertionFailure], Optional[Event]]:
         """Run the bot_uttered assertion on the given events for that user turn."""
         matching_event = None
-        error_messages = []
 
         if self.utter_name is not None:
             try:
@@ -734,8 +732,11 @@ class BotUtteredAssertion(Assertion):
                     and event.metadata.get("utter_action") == self.utter_name
                 )
             except StopIteration:
-                error_messages.append(
-                    f"Bot did not utter '{self.utter_name}' response."
+                error_message = f"Bot did not utter '{self.utter_name}' response."
+                error_message += assertion_order_error_message
+
+                return self._generate_assertion_failure(
+                    error_message, prior_events, turn_events, self.line
                 )
 
         if self.text_matches is not None:
@@ -747,11 +748,16 @@ class BotUtteredAssertion(Assertion):
                     if isinstance(event, BotUttered) and pattern.search(event.text)
                 )
             except StopIteration:
-                error_messages.append(
+                error_message = (
                     f"Bot did not utter any response which "
                     f"matches the provided text pattern "
                     f"'{self.text_matches}'."
                 )
+                error_message += assertion_order_error_message
+
+                return self._generate_assertion_failure(
+                    error_message, prior_events, turn_events, self.line
+                )
 
         if self.buttons:
             try:
@@ -761,16 +767,13 @@ class BotUtteredAssertion(Assertion):
                     if isinstance(event, BotUttered) and self._buttons_match(event)
                 )
             except StopIteration:
-                error_messages.append(
+                error_message = (
                     "Bot did not utter any response with the expected buttons."
                 )
-
-        if error_messages:
-            error_message = " ".join(error_messages)
-            error_message += assertion_order_error_message
-            return self._generate_assertion_failure(
-                error_message, prior_events, turn_events, self.line
-            )
+                error_message += assertion_order_error_message
+                return self._generate_assertion_failure(
+                    error_message, prior_events, turn_events, self.line
+                )
 
         return None, matching_event
 
@@ -800,126 +803,6 @@ class BotUtteredAssertion(Assertion):
         return hash(json.dumps(self.as_dict()))
 
 
-@dataclass
-class BotDidNotUtterAssertion(Assertion):
-    """Class for the 'bot_did_not_utter' assertion."""
-
-    utter_name: Optional[str] = None
-    text_matches: Optional[str] = None
-    buttons: Optional[List[AssertedButton]] = None
-    line: Optional[int] = None
-
-    @classmethod
-    def type(cls) -> str:
-        return AssertionType.BOT_DID_NOT_UTTER.value
-
-    @staticmethod
-    def from_dict(assertion_dict: Dict[Text, Any]) -> BotDidNotUtterAssertion:
-        """Creates a BotDidNotUtterAssertion from a dictionary."""
-        assertion_dict = assertion_dict.get(AssertionType.BOT_DID_NOT_UTTER.value, {})
-        utter_name = assertion_dict.get("utter_name")
-        text_matches = assertion_dict.get("text_matches")
-        buttons = [
-            AssertedButton.from_dict(button)
-            for button in assertion_dict.get("buttons", [])
-        ]
-
-        if not utter_name and not text_matches and not buttons:
-            raise RasaException(
-                "A 'bot_did_not_utter' assertion is empty. "
-                "It should contain at least one of the allowed properties: "
-                "'utter_name', 'text_matches', or 'buttons'."
-            )
-
-        return BotDidNotUtterAssertion(
-            utter_name=utter_name,
-            text_matches=text_matches,
-            buttons=buttons,
-            line=assertion_dict.lc.line + 1 if hasattr(assertion_dict, "lc") else None,
-        )
-
-    def run(
-        self,
-        turn_events: List[Event],
-        prior_events: List[Event],
-        assertion_order_error_message: str = "",
-        **kwargs: Any,
-    ) -> Tuple[Optional[AssertionFailure], Optional[Event]]:
-        """Checks that the bot did not utter the specified messages or buttons."""
-        for event in turn_events:
-            if isinstance(event, BotUttered):
-                error_messages = []
-                if self._utter_name_matches(event):
-                    error_messages.append(
-                        f"Bot uttered a forbidden utterance '{self.utter_name}'."
-                    )
-                if self._text_matches(event):
-                    error_messages.append(
-                        f"Bot uttered a forbidden message matching "
-                        f"the pattern '{self.text_matches}'."
-                    )
-                if self._buttons_match(event):
-                    error_messages.append(
-                        "Bot uttered a forbidden response with specified buttons."
-                    )
-
-                if error_messages:
-                    error_message = " ".join(error_messages)
-                    error_message += assertion_order_error_message
-                    return self._generate_assertion_failure(
-                        error_message, prior_events, turn_events, self.line
-                    )
-        return None, None
-
-    def _utter_name_matches(self, event: BotUttered) -> bool:
-        if self.utter_name is not None:
-            if event.metadata.get("utter_action") == self.utter_name:
-                return True
-        return False
-
-    def _text_matches(self, event: BotUttered) -> bool:
-        if self.text_matches is not None:
-            pattern = re.compile(self.text_matches)
-            if pattern.search(event.text):
-                return True
-        return False
-
-    def _buttons_match(self, event: BotUttered) -> bool:
-        """Check if the bot response contains any of the forbidden buttons."""
-        if self.buttons is None:
-            return False
-
-        actual_buttons = event.data.get("buttons", [])
-        if not actual_buttons:
-            return False
-
-        for actual_button in actual_buttons:
-            if any(
-                self._is_forbidden_button(actual_button, forbidden_button)
-                for forbidden_button in self.buttons
-            ):
-                return True
-        return False
-
-    @staticmethod
-    def _is_forbidden_button(
-        actual_button: Dict[str, Any], forbidden_button: AssertedButton
-    ) -> bool:
-        """Check if the button matches any of the forbidden buttons."""
-        actual_title = actual_button.get("title")
-        actual_payload = actual_button.get("payload")
-
-        title_matches = forbidden_button.title == actual_title
-        payload_matches = forbidden_button.payload == actual_payload
-        if title_matches and payload_matches:
-            return True
-        return False
-
-    def __hash__(self) -> int:
-        """Hash method to ensure the assertion is hashable."""
-        return hash(json.dumps(self.as_dict()))
-
-
 @dataclass
 class GenerativeResponseMixin(Assertion):
     """Mixin class for storing generative response assertions."""

rasa/e2e_test/assertions_schema.yml

@@ -83,29 +83,6 @@ schema;assertions:
            text_matches:
              type: str
              nullable: false
-       bot_did_not_utter:
-         type: map
-         nullable: false
-         mapping:
-           utter_name:
-             type: str
-             nullable: false
-           buttons:
-             type: seq
-             nullable: false
-             matching: "all"
-             sequence:
-               - type: map
-                 mapping:
-                   title:
-                     type: str
-                     nullable: false
-                   payload:
-                     type: str
-                     nullable: false
-           text_matches:
-             type: str
-             nullable: false
        generative_response_is_relevant:
          type: map
          mapping: