rasa-pro 3.14.0.dev10__py3-none-any.whl → 3.14.0.dev12__py3-none-any.whl

rasa/core/processor.py

@@ -1,6 +1,5 @@
 import copy
 import inspect
-import logging
 import os
 import re
 import tarfile
@@ -117,7 +116,6 @@ if TYPE_CHECKING:
     from rasa.core.available_endpoints import AvailableEndpoints
     from rasa.privacy.privacy_manager import BackgroundPrivacyManager
 
-logger = logging.getLogger(__name__)
 structlogger = structlog.get_logger()
 
 MAX_NUMBER_OF_PREDICTIONS = int(os.environ.get("MAX_NUMBER_OF_PREDICTIONS", "10"))
@@ -191,7 +189,11 @@ class MessageProcessor:
         except TypeError:
             raise ModelNotFound(f"Model {model_path} can not be loaded.")
 
-        logger.info(f"Loading model {model_tar}...")
+        structlogger.info(
+            "rasa.core.processor.load_model",
+            event_info="Loading model.",
+            model_path=model_tar,
+        )
         with TempDirectoryPath(get_temp_dir_name()) as temporary_directory:
             try:
                 metadata, runner = loader.load_predict_graph_runner(
@@ -366,8 +368,10 @@ class MessageProcessor:
                 `ActionSessionStart`.
         """
         if not tracker.applied_events() or self._has_session_expired(tracker):
-            logger.debug(
-                f"Starting a new session for conversation ID '{tracker.sender_id}'."
+            structlogger.debug(
+                "rasa.core.processor._update_tracker_session",
+                event_info="Starting a new session.",
+                sender_id=tracker.sender_id,
             )
 
             action_session_start = self._get_action(ACTION_SESSION_START_NAME)
@@ -599,9 +603,11 @@ class MessageProcessor:
             prediction.max_confidence_index, self.domain, self.action_endpoint
         )
 
-        logger.debug(
-            f"Predicted next action '{action.name()}' with confidence "
-            f"{prediction.max_confidence:.2f}."
+        structlogger.debug(
+            "rasa.core.processor.predict_next_with_tracker_if_should",
+            event_info="Predicted next action.",
+            action=action.name(),
+            confidence=prediction.max_confidence,
         )
 
         return action, prediction
@@ -651,8 +657,10 @@ class MessageProcessor:
                 and self._has_message_after_reminder(tracker, reminder_event)
                 or not self._is_reminder_still_valid(tracker, reminder_event)
             ):
-                logger.debug(
-                    f"Canceled reminder because it is outdated ({reminder_event})."
+                structlogger.debug(
+                    "rasa.core.processor.handle_reminder",
+                    event_info="Canceled reminder because it is outdated.",
+                    reminder_event=reminder_event,
                 )
             else:
                 intent = reminder_event.intent
@@ -1051,8 +1059,11 @@ class MessageProcessor:
 
         plugin_manager().hook.after_new_user_message(tracker=tracker)
 
-        logger.debug(
-            f"Logged UserUtterance - tracker now has {len(tracker.events)} events."
+        structlogger.debug(
+            "rasa.core.processor.handle_message_with_tracker",
+            event_info="Logged UserUtterance.",
+            user_message=message.text,
+            number_of_events=len(tracker.events),
         )
 
     @staticmethod
@@ -1167,9 +1178,11 @@ class MessageProcessor:
                     tracker
                 )
             except ActionLimitReached:
-                logger.warning(
-                    "Circuit breaker tripped. Stopped predicting "
-                    f"more actions for sender '{tracker.sender_id}'."
+                structlogger.warning(
+                    "rasa.core.processor.run_prediction_loop",
+                    event_info="Circuit breaker tripped. Stopped predicting more "
+                    "actions.",
+                    sender_id=tracker.sender_id,
                 )
                 if self.on_circuit_break:
                     # call a registered callback
@@ -1177,9 +1190,11 @@ class MessageProcessor:
                 break
 
             if prediction.is_end_to_end_prediction:
-                logger.debug(
-                    f"An end-to-end prediction was made which has triggered the 2nd "
-                    f"execution of the default action '{ACTION_EXTRACT_SLOTS}'."
+                structlogger.debug(
+                    "rasa.core.processor.run_prediction_loop",
+                    event_info="An end-to-end prediction was made which has "
+                    "triggered the 2nd execution of the default action.",
+                    action=ACTION_EXTRACT_SLOTS,
                 )
                 tracker = await self.run_action_extract_slots(output_channel, tracker)
 
@@ -1395,10 +1410,11 @@ class MessageProcessor:
             )
 
         if any(isinstance(e, UserUttered) for e in events):
-            logger.debug(
-                f"A `UserUttered` event was returned by executing "
+            structlogger.debug(
+                "rasa.core.processor.run_action",
+                message="A `UserUttered` event was returned by executing "
                 f"action '{action.name()}'. This will run the default action "
-                f"'{ACTION_EXTRACT_SLOTS}'."
+                f"'{ACTION_EXTRACT_SLOTS}'.",
             )
             tracker = await self.run_action_extract_slots(output_channel, tracker)
 
@@ -1517,9 +1533,10 @@ class MessageProcessor:
             > self.domain.session_config.session_expiration_time
         )
         if has_expired:
-            logger.debug(
-                f"The latest session for conversation ID '{tracker.sender_id}' has "
-                f"expired."
+            structlogger.debug(
+                "rasa.core.processor.has_session_expired",
+                event_info="The latest session has expired.",
+                sender_id=tracker.sender_id,
             )
 
         return has_expired
@@ -1545,10 +1562,14 @@ class MessageProcessor:
                 )
                 return prediction
 
-            logger.error(
-                f"Trying to run unknown follow-up action '{followup_action}'. "
-                "Instead of running that, Rasa Pro will ignore the action "
-                "and predict the next action."
+            structlogger.error(
+                "rasa.core.processor.predict_next_with_tracker",
+                event_info="Trying to run unknown follow-up action.",
+                message=(
+                    "Trying to run unknown follow-up action. Instead of running "
+                    "that, Rasa Pro will ignore the action and predict the next action."
+                ),
+                followup_action=followup_action,
             )
 
         target = self.model_metadata.core_target

rasa/core/run.py

@@ -97,10 +97,32 @@ def _create_single_channel(
     """
     from rasa.core.channels import BUILTIN_CHANNELS
 
+    # Channels that have optional dependencies
+    channels_with_optional_deps = {
+        "facebook": "fbmessenger",
+        "slack": "slack-sdk",
+        "telegram": "aiogram",
+        "twilio": "twilio",
+        "twilio_voice": "twilio",
+        "twilio_media_streams": "twilio",
+        "webexteams": "webexteamssdk",
+        "vier_cvg": "cvg_sdk",
+    }
+
     if channel in BUILTIN_CHANNELS:
         channel_class = BUILTIN_CHANNELS[channel]
 
         return channel_class.from_credentials(credentials)
+    elif channel in channels_with_optional_deps:
+        # Channel is known but not available due to missing dependency
+        dependency = channels_with_optional_deps[channel]
+        raise RasaException(
+            f"Channel '{channel}' is not available "
+            f"due to missing '{dependency}' dependency. "
+            f"Please install the required extra by running: "
+            f"pip install 'rasa-pro[channels]' OR "
+            f"poetry add 'rasa-pro[channels]'"
+        )
     else:
         # try to load channel based on class name
         try:

rasa/dialogue_understanding/commands/cancel_flow_command.py

@@ -6,7 +6,7 @@ from typing import Any, Dict, List
 
 import structlog
 
-from rasa.core.policies.flows.flow_executor import (
+from rasa.core.policies.flows.agent_executor import (
     remove_agent_stack_frame,
 )
 from rasa.dialogue_understanding.commands.command import Command

rasa/dialogue_understanding/commands/chit_chat_answer_command.py

@@ -16,7 +16,7 @@ from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
     AgentStackFrame,
     AgentState,
 )
-from rasa.shared.core.events import Event
+from rasa.shared.core.events import AgentInterrupted, Event
 from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
@@ -57,14 +57,22 @@ class ChitChatAnswerCommand(FreeFormAnswerCommand):
         """
         stack = tracker.stack
 
+        applied_events: List[Event] = []
+
         # if the top stack frame is an agent stack frame, we need to
-        # update the state to INTERRUPTED
+        # update the state to INTERRUPTED and add an AgentInterrupted event
         if top_stack_frame := stack.top():
             if isinstance(top_stack_frame, AgentStackFrame):
+                applied_events.append(
+                    AgentInterrupted(
+                        top_stack_frame.agent_id,
+                        top_stack_frame.flow_id,
+                    )
+                )
                 top_stack_frame.state = AgentState.INTERRUPTED
 
         stack.push(ChitchatPatternFlowStackFrame())
-        return tracker.create_stack_updated_events(stack)
+        return applied_events + tracker.create_stack_updated_events(stack)
 
     def __hash__(self) -> int:
         return hash(self.command())

rasa/dialogue_understanding/commands/clarify_command.py

@@ -17,7 +17,7 @@ from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
     AgentStackFrame,
     AgentState,
 )
-from rasa.shared.core.events import Event
+from rasa.shared.core.events import AgentInterrupted, Event
 from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
@@ -89,14 +89,22 @@ class ClarifyCommand(Command):
             if flow is not None
         ]
 
+        applied_events: List[Event] = []
+
         # if the top stack frame is an agent stack frame, we need to
-        # update the state to INTERRUPTED
+        # update the state to INTERRUPTED and add an AgentInterrupted event
         if top_stack_frame := stack.top():
             if isinstance(top_stack_frame, AgentStackFrame):
+                applied_events.append(
+                    AgentInterrupted(
+                        top_stack_frame.agent_id,
+                        top_stack_frame.flow_id,
+                    )
+                )
                 top_stack_frame.state = AgentState.INTERRUPTED
 
         stack.push(ClarifyPatternFlowStackFrame(names=names))
-        return tracker.create_stack_updated_events(stack)
+        return applied_events + tracker.create_stack_updated_events(stack)
 
     def __hash__(self) -> int:
         return hash(tuple(self.options))

rasa/dialogue_understanding/commands/knowledge_answer_command.py

@@ -16,7 +16,7 @@ from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
     AgentStackFrame,
     AgentState,
 )
-from rasa.shared.core.events import Event
+from rasa.shared.core.events import AgentInterrupted, Event
 from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
@@ -57,14 +57,22 @@ class KnowledgeAnswerCommand(FreeFormAnswerCommand):
         """
         stack = tracker.stack
 
+        applied_events: List[Event] = []
+
         # if the top stack frame is an agent stack frame, we need to
-        # update the state to INTERRUPTED
+        # update the state to INTERRUPTED and add an AgentInterrupted event
         if top_stack_frame := stack.top():
             if isinstance(top_stack_frame, AgentStackFrame):
+                applied_events.append(
+                    AgentInterrupted(
+                        top_stack_frame.agent_id,
+                        top_stack_frame.flow_id,
+                    )
+                )
                 top_stack_frame.state = AgentState.INTERRUPTED
 
         stack.push(SearchPatternFlowStackFrame())
-        return tracker.create_stack_updated_events(stack)
+        return applied_events + tracker.create_stack_updated_events(stack)
 
     def __hash__(self) -> int:
         return hash(self.command())

rasa/dialogue_understanding/generator/prompt_templates/agent_command_prompt_v2_claude_3_5_sonnet_20240620_template.jinja2

@@ -11,9 +11,9 @@ Your task is to analyze the current conversation context and generate a list of
 * `provide info`: Responding to the user's questions by supplying relevant information, such as answering FAQs or explaining services.
 * `offtopic reply`: Responding to casual or social user messages that are unrelated to any flows, engaging in friendly conversation and addressing off-topic remarks.
 * `hand over`: Handing over to a human, in case the user seems frustrated or explicitly asks to speak to one.
-* `repeat message`: Repeating the last bot message.
-{% if active_agent %} * `continue agent`: Continue the currently active agent {{ active_agent.name }}. This has HIGHEST PRIORITY when an agent is active and the user is responding to agent questions.{% endif %}
-{% if completed_agents %}* `restart agent agent_name`: Restart the agent with the given name, in case the user wants to change some answer to a previous question asked by the agent. For example, `restart agent car_research_agent` if the user changed his mind about the car he wants to buy. ONLY use agents that are listed in the `completed_agents` section.{% endif %}
+* `repeat message`: Repeating the last bot message.{% if active_agent %}
+* `continue agent`: Continue the currently active agent {{ active_agent.name }}. This has HIGHEST PRIORITY when an agent is active and the user is responding to agent questions.{% endif %}{% if completed_agents %}
+* `restart agent agent_name`: Restart the agent with the given name, in case the user wants to change some answer to a previous question asked by the agent. For example, `restart agent car_research_agent` if the user changed his mind about the car he wants to buy. ONLY use agents that are listed in the `completed_agents` section.{% endif %}
 
 --
 

rasa/dialogue_understanding/generator/prompt_templates/agent_command_prompt_v2_gpt_4o_2024_11_20_template.jinja2

@@ -19,9 +19,9 @@ Use the following structured data:
 * `provide info`: Responding to the user's questions by supplying relevant information, such as answering FAQs or explaining services.
 * `offtopic reply`: Responding to casual or social user messages that are unrelated to any flows, engaging in friendly conversation and addressing off-topic remarks.
 * `hand over`: Handing over to a human, in case the user seems frustrated or explicitly asks to speak to one.
-* `repeat message`: Repeating the last bot message.
-{% if active_agent %} * `continue agent`: Continue the currently active agent {{ active_agent.name }}. This has HIGHEST PRIORITY when an agent is active and the user is responding to agent questions.{% endif %}
-{% if completed_agents %}* `restart agent agent_name`: Restart the agent with the given name, in case the user wants to change some answer to a previous question asked by the agent. For example, `restart agent car_research_agent` if the user changed his mind about the car he wants to buy. ONLY use agents that are listed in the `completed_agents` section.{% endif %}
+* `repeat message`: Repeating the last bot message.{% if active_agent %}
+* `continue agent`: Continue the currently active agent {{ active_agent.name }}. This has HIGHEST PRIORITY when an agent is active and the user is responding to agent questions.{% endif %}{% if completed_agents %}
+* `restart agent agent_name`: Restart the agent with the given name, in case the user wants to change some answer to a previous question asked by the agent. For example, `restart agent car_research_agent` if the user changed his mind about the car he wants to buy. ONLY use agents that are listed in the `completed_agents` section.{% endif %}
 
 ---
 

rasa/dialogue_understanding/generator/prompt_templates/agent_command_prompt_v3_claude_3_5_sonnet_20240620_template.jinja2

@@ -9,9 +9,9 @@ Your task is to analyze the current conversation context and generate a list of
 * `disambiguate flows flow_name1 flow_name2 ... flow_name_n`: When a message could refer to multiple flows, list the possible flows as options to clarify. Example: `disambiguate flows list_contacts add_contact remove_contact`.
 * `search and reply`: Provide a response from the knowledge base to address the user's inquiry when no flows fit, including domain knowledge, FAQs, and all off-topic or social messages.
 * `cancel flow`: Cancel the current flow if the user requests it.
-* `repeat message`: Repeat the last bot message.
-{% if active_agent %} * `continue agent`: Continue the currently active agent {{ active_agent.name }}. This has HIGHEST PRIORITY when an agent is active and the user is responding to agent questions.{% endif %}
-{% if completed_agents %}* `restart agent agent_name`: Restart the agent with the given name, in case the user wants to change some answer to a previous question asked by the agent. For example, `restart agent car_research_agent` if the user changed his mind about the car he wants to buy. ONLY use agents that are listed in the `completed_agents` section.{% endif %}
+* `repeat message`: Repeat the last bot message.{% if active_agent %}
+* `continue agent`: Continue the currently active agent {{ active_agent.name }}. This has HIGHEST PRIORITY when an agent is active and the user is responding to agent questions.{% endif %}{% if completed_agents %}
+* `restart agent agent_name`: Restart the agent with the given name, in case the user wants to change some answer to a previous question asked by the agent. For example, `restart agent car_research_agent` if the user changed his mind about the car he wants to buy. ONLY use agents that are listed in the `completed_agents` section.{% endif %}
 
 ---
 

rasa/dialogue_understanding/generator/prompt_templates/agent_command_prompt_v3_gpt_4o_2024_11_20_template.jinja2

@@ -17,9 +17,9 @@ Use the following structured data:
 * `disambiguate flows flow_name1 flow_name2 ... flow_name_n`: When a message could refer to multiple flows, list the possible flows as options to clarify. Example: `disambiguate flows list_contacts add_contact remove_contact`.
 * `search and reply`: Provide a response from the knowledge base to address the user’s inquiry when no flows fit, including domain knowledge, FAQs, and all off-topic or social messages.
 * `cancel flow`: Cancel the current flow if the user requests it.
-* `repeat message`: Repeat the last bot message.
-{% if active_agent %} * `continue agent`: Continue the currently active agent {{ active_agent.name }}. This has HIGHEST PRIORITY when an agent is active and the user is responding to agent questions.{% endif %}
-{% if completed_agents %}* `restart agent agent_name`: Restart the agent with the given name, in case the user wants to change some answer to a previous question asked by the agent. For example, `restart agent car_research_agent` if the user changed his mind about the car he wants to buy. ONLY use agents that are listed in the `completed_agents` section.{% endif %}
+* `repeat message`: Repeat the last bot message.{% if active_agent %}
+* `continue agent`: Continue the currently active agent {{ active_agent.name }}. This has HIGHEST PRIORITY when an agent is active and the user is responding to agent questions.{% endif %}{% if completed_agents %}
+* `restart agent agent_name`: Restart the agent with the given name, in case the user wants to change some answer to a previous question asked by the agent. For example, `restart agent car_research_agent` if the user changed his mind about the car he wants to buy. ONLY use agents that are listed in the `completed_agents` section.{% endif %}
 
 ---
 

rasa/dialogue_understanding/generator/single_step/single_step_based_llm_command_generator.py

@@ -236,6 +236,8 @@ class SingleStepBasedLLMCommandGenerator(LLMBasedCommandGenerator, ABC):
             log_module=self.__class__.__name__,
             log_event="llm_command_generator.predict_commands.finished",
             commands=commands,
+            event_info="Commands predictd by the Command Generator",
+            highlight=True,
         )
 
         domain = kwargs.get("domain")

rasa/dialogue_understanding/processor/command_processor.py

@@ -499,6 +499,10 @@ def clean_up_commands(
         else:
             clean_commands.append(command)
 
+    # Replace CannotHandleCommands with ContinueAgentCommand when an agent is active
+    # to keep the agent running, but preserve chitchat
+    clean_commands = _replace_cannot_handle_with_continue_agent(clean_commands, tracker)
+
     # when coexistence is enabled, by default there will be a SetSlotCommand
     # for the ROUTE_TO_CALM_SLOT slot.
     if tracker.has_coexistence_routing_slot and len(clean_commands) > 2:
@@ -509,9 +513,14 @@ def clean_up_commands(
     clean_commands = ensure_max_number_of_command_type(
         clean_commands, RepeatBotMessagesCommand, 1
     )
+    clean_commands = ensure_max_number_of_command_type(
+        clean_commands, ContinueAgentCommand, 1
+    )
     structlogger.debug(
         "command_processor.clean_up_commands.final_commands",
         command=clean_commands,
+        event_info="Final commands",
+        highlight=True,
     )
 
     return clean_commands
@@ -580,6 +589,67 @@ def clean_up_start_flow_command(
     return clean_commands
 
 
+def _replace_cannot_handle_with_continue_agent(
+    clean_commands: List[Command],
+    tracker: DialogueStateTracker,
+) -> List[Command]:
+    """Replace CannotHandleCommands with ContinueAgentCommand when agent is active.
+
+    ContinueAgentCommand is added in the following cases:
+
+    1. LLM Command Generation Failures:
+       - LLM parsing failures (default reason)
+       - Force slot filling failures (default reason)
+
+    2. Invalid Commands During Cleanup:
+       - Invalid SetSlot commands:
+         - Slot not in domain
+         - Incompatible extractor
+       (Note: ChitChatAnswer command failures are preserved as CannotHandleCommand)
+
+    3. Empty Commands List:
+       - When all commands are filtered out during cleanup
+
+    Preserved as CannotHandleCommand (not replaced):
+    - Chitchat: CannotHandleCommand(RASA_PATTERN_CANNOT_HANDLE_CHITCHAT)
+    """
+    if not tracker.stack.agent_is_active():
+        return clean_commands
+
+    # If no commands at all and agent is active, add ContinueAgentCommand
+    if not clean_commands:
+        clean_commands.append(ContinueAgentCommand())
+        return clean_commands
+
+    has_continue_agent = any(
+        isinstance(cmd, ContinueAgentCommand) for cmd in clean_commands
+    )
+
+    # Collect CannotHandleCommands that should be replaced with ContinueAgentCommand
+    cannot_handle_commands = [
+        cmd
+        for cmd in clean_commands
+        if isinstance(cmd, CannotHandleCommand)
+        and cmd.reason != RASA_PATTERN_CANNOT_HANDLE_CHITCHAT
+    ]
+
+    if cannot_handle_commands:
+        structlogger.debug(
+            "command_processor.clean_up_commands"
+            ".replace_cannot_handle_with_continue_agent",
+            original_commands=clean_commands,
+        )
+        # Remove the CannotHandleCommands we collected
+        for cmd in cannot_handle_commands:
+            clean_commands.remove(cmd)
+
+        # Add ContinueAgentCommand if not already present
+        if not has_continue_agent:
+            clean_commands.append(ContinueAgentCommand())
+
+    return clean_commands
+
+
 def clean_up_clarify_command(
     commands_so_far: List[Command],
     all_commands: List[Command],

rasa/dialogue_understanding/stack/dialogue_stack.py

@@ -273,28 +273,3 @@ class DialogueStack:
 
     def agent_is_active(self) -> bool:
         return self.find_active_agent_frame() is not None
-
-    def get_all_user_flow_frames(
-        self, ignore_call_and_link_frames: bool = True
-    ) -> List[UserFlowStackFrame]:
-        """Get all user flow frames from the dialogue stack.
-
-        Args:
-            ignore_call_and_link_frames: Whether to ignore user frames of type `call`
-                and `link`. By default, these frames are ignored.
-
-        Returns:
-            A list of all user flow frames in the dialogue stack.
-        """
-        return [
-            frame
-            for frame in self.frames
-            if isinstance(frame, UserFlowStackFrame)
-            and (
-                not ignore_call_and_link_frames
-                or (
-                    frame.frame_type != FlowStackFrameType.CALL
-                    and frame.frame_type != FlowStackFrameType.LINK
-                )
-            )
-        ]

rasa/engine/loader.py

@@ -1,6 +1,8 @@
 from pathlib import Path
 from typing import Tuple, Type
 
+import structlog
+
 from rasa.engine.graph import ExecutionContext
 from rasa.engine.runner.interface import GraphRunner
 from rasa.engine.storage.storage import ModelMetadata, ModelStorage
@@ -9,6 +11,8 @@ from rasa.engine.validation import (
     validate_model_group_configuration_setup,
 )
 
+structlogger = structlog.get_logger()
+
 
 def load_predict_graph_runner(
     storage_path: Path,
@@ -30,6 +34,10 @@ def load_predict_graph_runner(
     model_storage, model_metadata = model_storage_class.from_model_archive(
         storage_path=storage_path, model_archive_path=model_archive_path
     )
+    structlogger.debug(
+        "engine.loader.load_predict_graph_runner.success",
+        model_id=model_metadata.model_id,
+    )
 
     # Components using LLMs or embeddings can reference model groups defined in
     # the endpoints.yml file for their client configurations. To ensure they will work
@@ -38,6 +46,10 @@ def load_predict_graph_runner(
     validate_model_group_configuration_setup()
     validate_model_client_configuration_setup_during_inference_time(model_metadata)
 
+    structlogger.debug(
+        "engine.loader.config.validation.success",
+        model_id=model_metadata.model_id,
+    )
     runner = graph_runner_class.create(
         graph_schema=model_metadata.predict_schema,
         model_storage=model_storage,