rasa-pro 3.14.0rc4__py3-none-any.whl → 3.15.0a1__py3-none-any.whl

rasa/cli/arguments/data.py

@@ -4,8 +4,10 @@ from typing import Text
 from rasa.cli.arguments.default_arguments import (
     add_data_param,
     add_domain_param,
+    add_endpoint_param,
     add_nlu_data_param,
     add_out_param,
+    add_sub_agents_param,
 )
 from rasa.shared.constants import DEFAULT_CONVERTED_DATA_PATH
 
@@ -91,6 +93,13 @@ def set_validator_arguments(parser: argparse.ArgumentParser) -> None:
     )
     add_domain_param(parser)
     add_data_param(parser)
+    add_sub_agents_param(parser)
+    # Endpoints are optional for `data validate` command
+    add_endpoint_param(
+        parser,
+        help_text="Configuration file for the connectors as a yml file.",
+        default=None,
+    )
 
 
 def set_migrate_arguments(parser: argparse.ArgumentParser) -> None:

rasa/cli/data.py

@@ -1,7 +1,7 @@
 import argparse
 import logging
 import pathlib
-from typing import List
+from typing import List, Optional
 
 import rasa.cli.utils
 import rasa.shared.core.domain
@@ -17,6 +17,7 @@ from rasa.cli.arguments import data as arguments
 from rasa.cli.arguments import default_arguments
 from rasa.cli.validation.bot_config import validate_files
 from rasa.cli.validation.config_path_validation import get_validated_path
+from rasa.core.config.configuration import Configuration
 from rasa.e2e_test.e2e_config import create_llm_e2e_test_converter_config
 from rasa.e2e_test.e2e_test_converter import E2ETestConverter
 from rasa.e2e_test.utils.e2e_yaml_utils import E2ETestYAMLWriter
@@ -139,8 +140,12 @@ def _add_data_validate_parsers(
     )
     _append_story_structure_arguments(validate_parser)
     validate_parser.set_defaults(
-        func=lambda args: validate_files(
-            args.fail_on_warnings, args.max_history, _build_training_data_importer(args)
+        func=lambda args: _validate_files_with_configuration(
+            args.fail_on_warnings,
+            args.max_history,
+            _build_training_data_importer(args),
+            sub_agents=args.sub_agents,
+            endpoints=args.endpoints,
         )
     )
     arguments.set_validator_arguments(validate_parser)
@@ -155,10 +160,12 @@ def _add_data_validate_parsers(
     _append_story_structure_arguments(story_structure_parser)
 
     story_structure_parser.set_defaults(
-        func=lambda args: validate_files(
+        func=lambda args: _validate_files_with_configuration(
             args.fail_on_warnings,
             args.max_history,
             _build_training_data_importer(args),
+            sub_agents=args.sub_agents,
+            endpoints=args.endpoints,
             stories_only=True,
         )
     )
@@ -171,10 +178,12 @@ def _add_data_validate_parsers(
         help="Checks for inconsistencies in the flows files.",
     )
     flows_structure_parser.set_defaults(
-        func=lambda args: validate_files(
+        func=lambda args: _validate_files_with_configuration(
             args.fail_on_warnings,
             args.max_history,
             _build_training_data_importer(args),
+            sub_agents=args.sub_agents,
+            endpoints=args.endpoints,
             flows_only=True,
         )
     )
@@ -187,10 +196,12 @@ def _add_data_validate_parsers(
         help="Checks for inconsistencies of the flow and response translation.",
     )
     translations_structure_parser.set_defaults(
-        func=lambda args: validate_files(
+        func=lambda args: _validate_files_with_configuration(
             args.fail_on_warnings,
             args.max_history,
             _build_training_data_importer(args),
+            sub_agents=args.sub_agents,
+            endpoints=args.endpoints,
             translations_only=True,
         )
     )
@@ -376,3 +387,58 @@ def convert_data_to_e2e_tests(args: argparse.Namespace) -> None:
         rasa.shared.utils.cli.print_error_and_exit(
             f"Failed to convert the data into E2E tests. Error: {exc}"
         )
+
+
+def _initialize_configuration_for_validation(
+    sub_agents: Optional[str] = None, endpoints: Optional[str] = None
+) -> None:
+    """Initialize Configuration before validation.
+
+    Args:
+        sub_agents: Path to sub-agents directory for validation.
+        endpoints: Path to the endpoints configuration file.
+    """
+    if endpoints:
+        Configuration.initialise_endpoints(endpoints_path=pathlib.Path(endpoints))
+    if sub_agents:
+        Configuration.initialise_sub_agents(pathlib.Path(sub_agents))
+    if not endpoints and not sub_agents:
+        Configuration.initialise_empty()
+
+
+def _validate_files_with_configuration(
+    fail_on_warnings: bool,
+    max_history: int,
+    importer: TrainingDataImporter,
+    sub_agents: Optional[str] = None,
+    endpoints: Optional[str] = None,
+    stories_only: bool = False,
+    flows_only: bool = False,
+    translations_only: bool = False,
+) -> None:
+    """Wrapper for validate_files that ensures Configuration is initialized first.
+
+    Args:
+        fail_on_warnings: `True` if the process should exit with a non-zero status
+        max_history: The max history to use when validating the story structure.
+        importer: The `TrainingDataImporter` to use to load the training data.
+        sub_agents: Path to sub-agents directory for validation.
+        endpoints: Path to the endpoints configuration file.
+        stories_only: If `True`, only the story structure is validated.
+        flows_only: If `True`, only the flows are validated.
+        translations_only: If `True`, only the translations data is validated.
+    """
+    # Initialize Configuration before calling validate_files
+    _initialize_configuration_for_validation(sub_agents=sub_agents, endpoints=endpoints)
+
+    # Call the original validate_files function
+    validate_files(
+        fail_on_warnings=fail_on_warnings,
+        max_history=max_history,
+        importer=importer,
+        stories_only=stories_only,
+        flows_only=flows_only,
+        translations_only=translations_only,
+        sub_agents=sub_agents,
+        endpoints=endpoints,
+    )

rasa/cli/interactive.py

@@ -12,6 +12,7 @@ from rasa import model
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import interactive as arguments
 from rasa.cli.validation.config_path_validation import get_validated_path
+from rasa.core.config.configuration import Configuration
 from rasa.core.constants import DEFAULT_SUB_AGENTS
 from rasa.engine.storage.local_model_storage import LocalModelStorage
 from rasa.shared.constants import (
@@ -140,6 +141,8 @@ def perform_interactive_learning(
         args.endpoints, "endpoints", DEFAULT_ENDPOINTS_PATH, True
     )
 
+    Configuration.initialise_endpoints(endpoints_path=Path(args.endpoints))
+
     do_interactive_learning(args, file_importer)
 
 

rasa/cli/llm_fine_tuning.py

@@ -414,6 +414,7 @@ def get_valid_endpoints(endpoints_file: str) -> AvailableEndpoints:
 
 def set_up_e2e_test_runner(args: argparse.Namespace) -> E2ETestRunner:
     endpoints = get_valid_endpoints(args.endpoints)
+    Configuration.initialise_sub_agents(args.sub_agents)
 
     if endpoints.model is None:
         args.model = validate_model_path(args.model, "model", DEFAULT_MODELS_PATH)

rasa/cli/project_templates/defaults.py

@@ -138,6 +138,7 @@ def get_rasa_defaults(config_yaml: Text, endpoints_yaml: Text) -> RasaDefaults:
         A RasaDefaults object containing the default values for the project.
     """
     config = read_yaml(config_yaml)
+    # Does not read from file, it converts the YAML content to a dictionary.
     endpoints = read_yaml(endpoints_yaml)
 
     prompts = get_system_default_prompts(config, endpoints)

rasa/cli/validation/bot_config.py

@@ -149,6 +149,7 @@ def validate_files(
     flows_only: bool = False,
     translations_only: bool = False,
     sub_agents: Optional[str] = None,
+    endpoints: Optional[str] = None,
 ) -> None:
     """Validates either the story structure or the entire project.
 
@@ -160,6 +161,7 @@ def validate_files(
         flows_only: If `True`, only the flows are validated.
         translations_only: If `True`, only the translations data is validated.
         sub_agents: Path to sub-agents directory for validation.
+        endpoints: Path to the endpoints configuration file.
     """
     from rasa.validator import Validator
 

rasa/constants.py

@@ -18,7 +18,7 @@ CONFIG_TELEMETRY_ID = "rasa_user_id"
 CONFIG_TELEMETRY_ENABLED = "enabled"
 CONFIG_TELEMETRY_DATE = "date"
 
-MINIMUM_COMPATIBLE_VERSION = "3.14.0.dev10"
+MINIMUM_COMPATIBLE_VERSION = "3.14.0rc3"
 
 GLOBAL_USER_CONFIG_PATH = os.path.expanduser("~/.config/rasa/global.yml")
 
@@ -33,6 +33,7 @@ ENV_MCP_LOGGING_ENABLED = "MCP_LOGGING_ENABLED"
 ENV_LOG_LEVEL_MATPLOTLIB = "LOG_LEVEL_MATPLOTLIB"
 ENV_LOG_LEVEL_RABBITMQ = "LOG_LEVEL_RABBITMQ"
 ENV_LOG_LEVEL_KAFKA = "LOG_LEVEL_KAFKA"
+ENV_LOG_LEVEL_PYMONGO = "LOG_LEVEL_PYMONGO"
 
 DEFAULT_SANIC_WORKERS = 1
 ENV_SANIC_WORKERS = "SANIC_WORKERS"

rasa/core/actions/action_exceptions.py

@@ -12,7 +12,7 @@ class ActionExecutionRejection(RasaException):
         self.message = message or "Custom action '{}' rejected to run".format(
             action_name
         )
-        super(ActionExecutionRejection, self).__init__()
+        super(ActionExecutionRejection, self).__init__(self.message)
 
     def __str__(self) -> str:
         return self.message

rasa/core/agent.py

@@ -297,7 +297,10 @@ async def load_agent(
         return agent
 
     except AgentInitializationException as e:
-        raise e
+        if e.suppress_stack_trace:
+            raise e from None
+        else:
+            raise e
     except Exception as e:
         logger.error(f"Could not load model due to {e}.", exc_info=True)
         return agent

rasa/core/available_agents.py

@@ -114,7 +114,7 @@ class AvailableAgents:
             else:
                 # We are using the default folder, it may not be created yet
                 # Init with an empty agents in this case
-                structlogger.info(
+                structlogger.debug(
                     f"Default agents config folder '{sub_agents_folder}' does not "
                     f"exist. Agent configurations won't be loaded."
                 )

rasa/core/exceptions.py

@@ -14,7 +14,7 @@ class AgentNotReady(RasaCoreException):
     def __init__(self, message: Text) -> None:
         """Initialize message attribute."""
         self.message = message
-        super(AgentNotReady, self).__init__()
+        super(AgentNotReady, self).__init__(message)
 
 
 class ChannelConfigError(RasaCoreException):

rasa/core/featurizers/tracker_featurizers.py

@@ -58,7 +58,7 @@ class InvalidStory(RasaException):
           message: a custom exception message.
         """
         self.message = message
-        super(InvalidStory, self).__init__()
+        super(InvalidStory, self).__init__(message)
 
     def __str__(self) -> Text:
         return self.message
@@ -174,6 +174,7 @@ class TrackerFeaturizer:
 
         Args:
             trackers_as_actions: A list of tracker labels.
+            domain: The domain containing action names.
 
         Returns:
             Label IDs for each tracker
@@ -854,7 +855,7 @@ class MaxHistoryTrackerFeaturizer(TrackerFeaturizer):
         """Creates an iterator over training examples from a tracker.
 
         Args:
-            trackers: The tracker from which to extract training examples.
+            tracker: The tracker from which to extract training examples.
             domain: The domain of the training data.
             omit_unset_slots: If `True` do not include the initial values of slots.
             ignore_action_unlikely_intent: Whether to remove `action_unlikely_intent`

rasa/core/persistor.py

@@ -314,7 +314,7 @@ class AWSPersistor(Persistor):
             obj = self.s3.Object(self.bucket_name, model_path)
             return obj.content_length
         except Exception:
-            raise ModelNotFound()
+            raise ModelNotFound("Model not found")
 
     def _retrieve_tar(
         self, target_filename: str, target_path: Optional[str] = None
@@ -349,7 +349,7 @@ class AWSPersistor(Persistor):
                     target_filename=target_filename,
                     event_info=log,
                 )
-                raise ModelNotFound() from exc
+                raise ModelNotFound("Model not found") from exc
         except exceptions.BotoCoreError as exc:
             structlogger.error(
                 "aws_persistor.retrieve_tar.model_download_error",
@@ -357,7 +357,7 @@ class AWSPersistor(Persistor):
                 target_filename=target_filename,
                 event_info=log,
             )
-            raise ModelNotFound() from exc
+            raise ModelNotFound("Model not found") from exc
 
 
 class GCSPersistor(Persistor):
@@ -447,7 +447,7 @@ class GCSPersistor(Persistor):
             blob = self.bucket.blob(target_filename)
             return blob.size
         except Exception:
-            raise ModelNotFound()
+            raise ModelNotFound("Model not found")
 
     def _retrieve_tar(
         self, target_filename: str, target_path: Optional[str] = None
@@ -481,7 +481,7 @@ class GCSPersistor(Persistor):
                 target_filename=target_filename,
                 event_info=log,
             )
-            raise ModelNotFound() from exc
+            raise ModelNotFound("Model not found") from exc
 
 
 class AzurePersistor(Persistor):
@@ -534,7 +534,7 @@ class AzurePersistor(Persistor):
             properties = blob_client.get_blob_properties()
             return properties.size
         except Exception:
-            raise ModelNotFound()
+            raise ModelNotFound("Model not found")
 
     def _retrieve_tar(
         self, target_filename: Text, target_path: Optional[str] = None
@@ -570,4 +570,4 @@ class AzurePersistor(Persistor):
                 event_info=log,
                 exception=exc,
             )
-            raise ModelNotFound() from exc
+            raise ModelNotFound("Model not found") from exc

rasa/core/policies/flows/agent_executor.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import asyncio
-from typing import Any, Dict, List, Optional, cast
+from typing import Any, Dict, List, Optional, Tuple, cast
 
 import structlog
 
@@ -24,6 +24,7 @@ from rasa.core.policies.flows.flow_step_result import (
     PauseFlowReturnPrediction,
 )
 from rasa.core.utils import get_slot_names_from_exit_conditions
+from rasa.dialogue_understanding.patterns.cancel import CancelPatternFlowStackFrame
 from rasa.dialogue_understanding.patterns.internal_error import (
     InternalErrorPatternFlowStackFrame,
 )
@@ -31,6 +32,7 @@ from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
     AgentStackFrame,
     AgentState,
+    BaseFlowStackFrame,
 )
 from rasa.shared.agents.utils import get_protocol_type
 from rasa.shared.core.constants import (
@@ -46,9 +48,11 @@ from rasa.shared.core.events import (
     AgentResumed,
     AgentStarted,
     Event,
+    FlowCancelled,
     SlotSet,
     deserialise_events,
 )
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.flows.steps import (
     CallFlowStep,
 )
@@ -85,6 +89,7 @@ async def run_agent(
     step: CallFlowStep,
     tracker: DialogueStateTracker,
     slots: List[Slot],
+    flows: FlowsList,
 ) -> FlowStepResult:
     """Run an agent call step."""
     structlogger.debug(
@@ -177,9 +182,13 @@ async def run_agent(
     elif output.status == AgentStatus.COMPLETED:
         return _handle_agent_completed(output, final_events, stack, step)
     elif output.status == AgentStatus.FATAL_ERROR:
-        return _handle_agent_fatal_error(output, final_events, stack, step)
+        return _handle_agent_fatal_error(
+            output, final_events, stack, step, flows, tracker
+        )
     else:
-        return _handle_agent_unknown_status(output, final_events, stack, step)
+        return _handle_agent_unknown_status(
+            output, final_events, stack, step, flows, tracker
+        )
 
 
 async def _call_agent_with_retry(
@@ -299,6 +308,8 @@ def _handle_agent_unknown_status(
     final_events: List[Event],
     stack: DialogueStack,
     step: CallFlowStep,
+    flows: FlowsList,
+    tracker: DialogueStateTracker,
 ) -> FlowStepResult:
     """Handle unknown agent status.
 
@@ -307,6 +318,8 @@ def _handle_agent_unknown_status(
         final_events: List of events to be added to the final result
         stack: The dialogue stack
         step: The flow step that called the agent
+        flows: All flows
+        tracker: The dialogue state tracker
 
     Returns:
         FlowStepResult indicating to continue with internal error pattern
@@ -320,8 +333,21 @@ def _handle_agent_unknown_status(
         flow_id=step.flow_id,
         status=output.status,
     )
+    # remove the agent stack frame
     remove_agent_stack_frame(stack, step.call)
     final_events.append(AgentCancelled(agent_id=step.call, flow_id=step.flow_id))
+
+    # cancel the current active flow:
+    # push the cancel pattern stack frame and add the flow cancelled event
+    cancel_pattern_stack_frame, flow_cancelled_event = _cancel_flow(
+        stack, flows, tracker, step
+    )
+    if cancel_pattern_stack_frame:
+        stack.push(cancel_pattern_stack_frame)
+    if flow_cancelled_event:
+        final_events.append(flow_cancelled_event)
+
+    # trigger the internal error pattern
     stack.push(InternalErrorPatternFlowStackFrame())
     return ContinueFlowWithNextStep(events=final_events)
 
@@ -418,6 +444,8 @@ def _handle_agent_fatal_error(
     final_events: List[Event],
     stack: DialogueStack,
     step: CallFlowStep,
+    flows: FlowsList,
+    tracker: DialogueStateTracker,
 ) -> FlowStepResult:
     """Handle fatal error from agent execution.
 
@@ -426,13 +454,15 @@ def _handle_agent_fatal_error(
         final_events: List of events to be added to the final result
         stack: The dialogue stack
         step: The flow step that called the agent
+        flows: All flows
+        tracker: The dialogue state tracker
 
     Returns:
         FlowStepResult indicating to continue with internal error pattern
     """
     output.metadata = output.metadata or {}
     _update_agent_events(final_events, output.metadata)
-    # the agent failed, trigger pattern_internal_error
+    # the agent failed, cancel the current flow and trigger pattern_internal_error
     structlogger.error(
         "flow.step.run_agent.fatal_error",
         agent_name=step.call,
@@ -440,16 +470,66 @@ def _handle_agent_fatal_error(
         flow_id=step.flow_id,
         error_message=output.error_message,
     )
+    # remove the agent stack frame
     remove_agent_stack_frame(stack, step.call)
     final_events.append(
         AgentCancelled(
             agent_id=step.call, flow_id=step.flow_id, reason=output.error_message
         )
     )
+
+    # cancel the current active flow:
+    # push the cancel pattern stack frame and add the flow cancelled event
+    cancel_pattern_stack_frame, flow_cancelled_event = _cancel_flow(
+        stack, flows, tracker, step
+    )
+    if cancel_pattern_stack_frame:
+        stack.push(cancel_pattern_stack_frame)
+    if flow_cancelled_event:
+        final_events.append(flow_cancelled_event)
+
+    # push the internal error pattern stack frame
     stack.push(InternalErrorPatternFlowStackFrame())
     return ContinueFlowWithNextStep(events=final_events)
 
 
+def _cancel_flow(
+    stack: DialogueStack,
+    flows: FlowsList,
+    tracker: DialogueStateTracker,
+    step: CallFlowStep,
+) -> Tuple[Optional[CancelPatternFlowStackFrame], Optional[FlowCancelled]]:
+    """Cancel the current active flow.
+
+    Creates a cancel pattern stack frame and a flow cancelled event.
+    """
+    from rasa.dialogue_understanding.commands import CancelFlowCommand
+
+    cancel_pattern_stack_frame = None
+    flow_cancelled_event = None
+
+    top_frame = stack.top()
+
+    if isinstance(top_frame, BaseFlowStackFrame):
+        flow = flows.flow_by_id(step.flow_id)
+        flow_name = (
+            flow.readable_name(language=tracker.current_language)
+            if flow
+            else step.flow_id
+        )
+
+        canceled_frames = CancelFlowCommand.select_canceled_frames(stack)
+
+        cancel_pattern_stack_frame = CancelPatternFlowStackFrame(
+            canceled_name=flow_name,
+            canceled_frames=canceled_frames,
+        )
+
+        flow_cancelled_event = FlowCancelled(step.flow_id, step.id)
+
+    return cancel_pattern_stack_frame, flow_cancelled_event
+
+
 ################################################################################
 # Create predictions
 ################################################################################

rasa/core/policies/flows/flow_exceptions.py

@@ -5,14 +5,17 @@ from rasa.shared.exceptions import RasaException
 class FlowException(RasaException):
     """Exception that is raised when there is a problem with a flow."""
 
-    pass
+    def __init__(self, message: str = "Flow error occurred") -> None:
+        """Initialize FlowException with a message."""
+        super().__init__(message)
 
 
 class FlowCircuitBreakerTrippedException(FlowException):
     """Exception that is raised when the flow circuit breaker tripped.
 
     The circuit breaker gets tripped when a flow seems to be stuck in
-    executing steps and does not make any progress."""
+    executing steps and does not make any progress.
+    """
 
     def __init__(
         self, dialogue_stack: DialogueStack, number_of_steps_taken: int

rasa/core/policies/flows/flow_executor.py

@@ -357,6 +357,10 @@ def reset_scoped_slots(
     flow_persistable_slots = current_flow.persisted_slots
 
     for step in current_flow.steps_with_calls_resolved:
+        # take persisted slots from called flows into consideration
+        # before resetting slots
+        if isinstance(step, CallFlowStep) and step.called_flow_reference:
+            flow_persistable_slots.extend(step.called_flow_reference.persisted_slots)
         if isinstance(step, CollectInformationFlowStep):
             # reset all slots scoped to the flow
             slot_name = step.collect
@@ -368,7 +372,22 @@ def reset_scoped_slots(
     # slots set by the set slots step should be reset after the flow ends
     # unless they are also used in a collect step where `reset_after_flow_ends`
     # is set to `False` or set in the `persisted_slots` list.
-    resettable_set_slots = [
+    resettable_set_slots = _get_resettable_set_slots(
+        current_flow, not_resettable_slot_names, flow_persistable_slots
+    )
+    for name in resettable_set_slots:
+        _reset_slot(name, tracker)
+
+    return events
+
+
+def _get_resettable_set_slots(
+    current_flow: Flow,
+    not_resettable_slot_names: set[Text],
+    flow_persistable_slots: List[Text],
+) -> List[Text]:
+    """Get list of slot names from SetSlotsFlowStep that should be reset."""
+    return [
         slot["key"]
         for step in current_flow.steps_with_calls_resolved
         if isinstance(step, SetSlotsFlowStep)
@@ -377,11 +396,6 @@ def reset_scoped_slots(
         and slot["key"] not in flow_persistable_slots
     ]
 
-    for name in resettable_set_slots:
-        _reset_slot(name, tracker)
-
-    return events
-
 
 async def advance_flows(
     tracker: DialogueStateTracker,
@@ -650,7 +664,7 @@ async def run_step(
         return _run_link_step(initial_events, stack, step)
 
     elif isinstance(step, CallFlowStep):
-        return await _run_call_step(initial_events, stack, step, tracker, slots)
+        return await _run_call_step(initial_events, stack, step, tracker, slots, flows)
 
     elif isinstance(step, SetSlotsFlowStep):
         return _run_set_slot_step(initial_events, step)
@@ -723,12 +737,13 @@ async def _run_call_step(
     step: CallFlowStep,
     tracker: DialogueStateTracker,
     slots: List[Slot],
+    flows: FlowsList,
 ) -> FlowStepResult:
     structlogger.debug("flow.step.run.call")
     if step.is_calling_mcp_tool():
         return await call_mcp_tool(initial_events, stack, step, tracker)
     elif step.is_calling_agent():
-        return await run_agent(initial_events, stack, step, tracker, slots)
+        return await run_agent(initial_events, stack, step, tracker, slots, flows)
     else:
         stack.push(
             UserFlowStackFrame(

rasa/core/policies/flows/mcp_tool_executor.py

@@ -1,4 +1,5 @@
 import json
+from datetime import timedelta
 from typing import Any, Dict, List, Optional
 
 import structlog
@@ -24,6 +25,7 @@ structlogger = structlog.get_logger()
 
 CONFIG_VALUE = "value"
 CONFIG_SLOT = "slot"
+TOOL_CALL_DEFATULT_TIMEOUT = 10  # seconds
 
 
 async def call_mcp_tool(
@@ -102,7 +104,11 @@ async def _execute_mcp_tool_call(
 
         # Call the tool with parameters
         mcp_server = await mcp_server_connection.ensure_active_session()
-        result = await mcp_server.call_tool(step.call, arguments)
+        result = await mcp_server.call_tool(
+            step.call,
+            arguments,
+            read_timeout_seconds=timedelta(seconds=TOOL_CALL_DEFATULT_TIMEOUT),
+        )
 
         # Handle tool execution result
         if result is None or result.isError:

rasa/core/policies/rule_policy.py

@@ -84,7 +84,7 @@ class InvalidRule(RasaException):
     """Exception that can be raised when rules are not valid."""
 
     def __init__(self, message: Text) -> None:
-        super().__init__()
+        super().__init__(message)
         self.message = message
 
     def __str__(self) -> Text: