rasa-pro 3.13.11__py3-none-any.whl → 3.14.0__py3-none-any.whl

rasa/builder/validation_service.py

@@ -0,0 +1,101 @@
+"""Functions for validating Rasa projects."""
+
+import sys
+from contextlib import contextmanager
+from typing import Any, Dict, Generator, Optional
+
+import structlog
+
+from rasa.builder import config
+from rasa.builder.exceptions import ValidationError
+from rasa.builder.logging_utils import capture_validation_logs
+from rasa.cli.validation.bot_config import validate_files
+from rasa.shared.importers.importer import TrainingDataImporter
+
+structlogger = structlog.get_logger()
+
+
+@contextmanager
+def _mock_sys_exit() -> Generator[Dict[str, bool], Any, None]:
+    """Context manager to prevent sys.exit from being called during validation."""
+    was_sys_exit_called = {"value": False}
+
+    def sys_exit_mock(code: int = 0) -> None:
+        was_sys_exit_called["value"] = True
+
+    original_exit = sys.exit
+    sys.exit = sys_exit_mock  # type: ignore[assignment]
+
+    try:
+        yield was_sys_exit_called
+    finally:
+        sys.exit = original_exit
+
+
+async def validate_project(importer: TrainingDataImporter) -> Optional[str]:
+    """Validate a Rasa project.
+
+    Args:
+        importer: Training data importer with domain, flows, and config
+
+    Returns:
+        None if validation passes, error message if validation fails.
+
+    Raises:
+        ValidationError: If validation fails
+    """
+    with capture_validation_logs() as captured_logs:
+        try:
+            with _mock_sys_exit() as exit_tracker:
+                from rasa.core.config.configuration import Configuration
+
+                Configuration.initialise_empty()
+
+                validate_files(
+                    fail_on_warnings=config.VALIDATION_FAIL_ON_WARNINGS,
+                    max_history=config.VALIDATION_MAX_HISTORY,
+                    importer=importer,
+                )
+
+                if exit_tracker["value"]:
+                    error_logs = [
+                        log for log in captured_logs if log.get("log_level") != "debug"
+                    ]
+                    structlogger.error(
+                        "validation.failed.sys_exit",
+                        error_logs=error_logs,
+                    )
+                    raise ValidationError(
+                        "Validation failed with sys.exit", validation_logs=error_logs
+                    )
+
+                structlogger.info("validation.success")
+                return None
+
+        except ValidationError:
+            raise
+
+        except Exception as e:
+            error_msg = f"Validation failed with exception: {e}"
+
+            error_logs = [
+                log for log in captured_logs if log.get("log_level") != "debug"
+            ]
+
+            structlogger.error(
+                "validation.failed.exception", error=str(e), validation_logs=error_logs
+            )
+            raise ValidationError(error_msg, validation_logs=error_logs)
+
+        except SystemExit as e:
+            error_logs = [
+                log for log in captured_logs if log.get("log_level") != "debug"
+            ]
+
+            structlogger.error(
+                "validation.failed.sys_exit",
+                error_logs=error_logs,
+            )
+            raise ValidationError(
+                f"SystemExit during validation: {e}", validation_logs=error_logs
+            )

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/arguments/default_arguments.py

@@ -3,6 +3,7 @@ import logging
 from enum import Enum
 from typing import List, Optional, Text, Union
 
+from rasa.core.constants import DEFAULT_SUB_AGENTS
 from rasa.core.persistor import RemoteStorageType, StorageType, parse_remote_storage
 from rasa.shared.constants import (
     DEFAULT_CONFIG_PATH,
@@ -217,3 +218,14 @@ def add_skip_validation_flag(
         action="append",
         help="Skip YAML validation for selected parts of the training data.",
     )
+
+
+def add_sub_agents_param(
+    parser: Union[argparse.ArgumentParser, argparse._ActionsContainer],
+) -> None:
+    parser.add_argument(
+        "--sub-agents",
+        type=str,
+        default=DEFAULT_SUB_AGENTS,
+        help="Directory that specifies sub-agents to use (default: %(default)s).",
+    )

rasa/cli/arguments/run.py

@@ -7,6 +7,7 @@ from rasa.cli.arguments.default_arguments import (
     add_model_param,
     add_remote_storage_param,
     add_skip_validation_flag,
+    add_sub_agents_param,
 )
 from rasa.core import constants
 from rasa.env import (
@@ -24,6 +25,7 @@ def set_run_arguments(parser: argparse.ArgumentParser) -> None:
     add_server_arguments(parser)
     add_inspect_argument(parser)
     add_skip_validation_flag(parser)
+    add_sub_agents_param(parser)
 
 
 def set_run_action_arguments(parser: argparse.ArgumentParser) -> None:

rasa/cli/arguments/train.py

@@ -10,6 +10,7 @@ from rasa.cli.arguments.default_arguments import (
     add_remote_root_only_param,
     add_remote_storage_param,
     add_stories_param,
+    add_sub_agents_param,
 )
 from rasa.graph_components.providers.training_tracker_provider import (
     TrainingTrackerProvider,
@@ -43,6 +44,7 @@ def set_train_arguments(parser: argparse.ArgumentParser) -> None:
     )
     add_remote_storage_param(parser)
     add_remote_root_only_param(parser)
+    add_sub_agents_param(parser)
 
 
 def set_train_core_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
@@ -15,6 +15,9 @@ from rasa import telemetry
 from rasa.cli import SubParsersAction
 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
@@ -137,8 +140,12 @@ def _add_data_validate_parsers(
     )
     _append_story_structure_arguments(validate_parser)
     validate_parser.set_defaults(
-        func=lambda args: rasa.cli.utils.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)
@@ -153,10 +160,12 @@ def _add_data_validate_parsers(
     _append_story_structure_arguments(story_structure_parser)
 
     story_structure_parser.set_defaults(
-        func=lambda args: rasa.cli.utils.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,
         )
     )
@@ -169,10 +178,12 @@ def _add_data_validate_parsers(
         help="Checks for inconsistencies in the flows files.",
     )
     flows_structure_parser.set_defaults(
-        func=lambda args: rasa.cli.utils.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,
         )
     )
@@ -185,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: rasa.cli.utils.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,
         )
     )
@@ -196,12 +209,12 @@ def _add_data_validate_parsers(
 
 
 def _build_training_data_importer(args: argparse.Namespace) -> "TrainingDataImporter":
-    config = rasa.cli.utils.get_validated_path(
+    config = get_validated_path(
         args.config, "config", DEFAULT_CONFIG_PATH, none_is_valid=True
     )
 
     # Exit the validation if the domain path is invalid
-    domain = rasa.cli.utils.get_validated_path(
+    domain = get_validated_path(
         args.domain, "domain", DEFAULT_DOMAIN_PATHS, none_is_valid=False
     )
 
@@ -231,7 +244,7 @@ def split_nlu_data(args: argparse.Namespace) -> None:
     Args:
         args: Commandline arguments
     """
-    data_path = rasa.cli.utils.get_validated_path(args.nlu, "nlu", DEFAULT_DATA_PATH)
+    data_path = get_validated_path(args.nlu, "nlu", DEFAULT_DATA_PATH)
     data_path = rasa.shared.data.get_nlu_directory(data_path)
 
     nlu_data = rasa.shared.nlu.training_data.loading.load_data(data_path)
@@ -258,7 +271,7 @@ def split_stories_data(args: argparse.Namespace) -> None:
         YAMLStoryReader,
     )
 
-    data_path = rasa.cli.utils.get_validated_path(args.nlu, "nlu", DEFAULT_DATA_PATH)
+    data_path = get_validated_path(args.nlu, "nlu", DEFAULT_DATA_PATH)
     data_files = rasa.shared.data.get_data_files(
         data_path, YAMLStoryReader.is_stories_file
     )
@@ -374,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/dialogue_understanding_test.py

@@ -3,6 +3,7 @@ import asyncio
 import datetime
 import importlib
 import sys
+from pathlib import Path
 from typing import Any, Dict, List, Optional, Type, cast
 
 import structlog
@@ -14,9 +15,11 @@ from rasa.cli.arguments.default_arguments import (
     add_endpoint_param,
     add_model_param,
     add_remote_storage_param,
+    add_sub_agents_param,
 )
 from rasa.core.agent import Agent
-from rasa.core.available_endpoints import AvailableEndpoints
+from rasa.core.config.available_endpoints import AvailableEndpoints
+from rasa.core.config.configuration import Configuration
 from rasa.core.exceptions import AgentNotReady
 from rasa.core.processor import MessageProcessor
 from rasa.dialogue_understanding.commands import Command
@@ -47,7 +50,6 @@ from rasa.dialogue_understanding_test.validation import (
 from rasa.e2e_test.e2e_test_case import TestSuite
 from rasa.exceptions import RasaException
 from rasa.shared.constants import (
-    DEFAULT_ENDPOINTS_PATH,
     LLM_CONFIG_KEY,
     ROUTE_TO_CALM_SLOT,
 )
@@ -174,6 +176,8 @@ def add_du_test_arguments(parser: argparse.ArgumentParser) -> None:
         ),
     )
 
+    add_sub_agents_param(du_arguments)
+
 
 def ensure_calm_only_bot(agent: Agent) -> None:
     if agent.domain is None or agent.processor is None:
@@ -210,6 +214,7 @@ def execute_dialogue_understanding_tests(args: argparse.Namespace) -> None:
 
     # initialization of endpoints
     endpoints = set_up_available_endpoints(args)
+    Configuration.initialise_sub_agents(args.sub_agents)
 
     # set up the test runner, e.g. start the agent
     try:
@@ -218,6 +223,7 @@ def execute_dialogue_understanding_tests(args: argparse.Namespace) -> None:
             model_path=args.model,
             model_server=endpoints.model,
             remote_storage=args.remote_storage,
+            sub_agents_path=args.sub_agents,
         )
     except AgentNotReady as error:
         structlogger.error(
@@ -323,11 +329,9 @@ def get_valid_test_suite(
 
 
 def set_up_available_endpoints(args: argparse.Namespace) -> AvailableEndpoints:
-    """Set up the available endpoints for the test runner."""
-    args.endpoints = rasa.cli.utils.get_validated_path(
-        args.endpoints, "endpoints", DEFAULT_ENDPOINTS_PATH, True
-    )
-    endpoints = AvailableEndpoints.get_instance(args.endpoints)
+    endpoints = Configuration.initialise_endpoints(
+        endpoints_path=Path(args.endpoints)
+    ).endpoints
 
     # Ignore all endpoints apart from action server, model, and nlu
     # to ensure InMemoryTrackerStore is being used instead of production

rasa/cli/e2e_test.py

@@ -17,8 +17,9 @@ from rasa.cli.arguments.default_arguments import (
     add_endpoint_param,
     add_model_param,
     add_remote_storage_param,
+    add_sub_agents_param,
 )
-from rasa.core.available_endpoints import AvailableEndpoints
+from rasa.core.config.configuration import Configuration, EndpointsConfigPath
 from rasa.core.exceptions import AgentNotReady
 from rasa.e2e_test.aggregate_test_stats_calculator import (
     AggregateTestStatsCalculator,
@@ -50,7 +51,7 @@ from rasa.e2e_test.utils.io import (
 )
 from rasa.e2e_test.utils.validation import validate_model_path
 from rasa.exceptions import RasaException
-from rasa.shared.constants import DEFAULT_ENDPOINTS_PATH, DEFAULT_MODELS_PATH
+from rasa.shared.constants import DEFAULT_MODELS_PATH
 from rasa.utils.endpoints import EndpointConfig
 
 RASA_PRO_BETA_FINE_TUNING_RECIPE_ENV_VAR_NAME = "RASA_PRO_BETA_FINE_TUNING_RECIPE"
@@ -147,6 +148,8 @@ def add_e2e_test_arguments(parser: argparse.ArgumentParser) -> None:
         help="Directory where to save coverage report to.",
     )
 
+    add_sub_agents_param(parser)
+
 
 def execute_e2e_tests(args: argparse.Namespace) -> None:
     """Run the end-to-end tests.
@@ -154,10 +157,10 @@ def execute_e2e_tests(args: argparse.Namespace) -> None:
     Args:
         args: Commandline arguments.
     """
-    args.endpoints = rasa.cli.utils.get_validated_path(
-        args.endpoints, "endpoints", DEFAULT_ENDPOINTS_PATH, True
-    )
-    endpoints = AvailableEndpoints.get_instance(args.endpoints)
+    endpoints = Configuration.initialise_endpoints(
+        endpoints_path=EndpointsConfigPath.validate(args.endpoints)
+    ).endpoints
+    Configuration.initialise_sub_agents(args.sub_agents)
 
     # Ignore all endpoints apart from action server, model, nlu and nlg
     # to ensure InMemoryTrackerStore is being used instead of production
@@ -192,6 +195,7 @@ def execute_e2e_tests(args: argparse.Namespace) -> None:
             model_server=endpoints.model,
             endpoints=endpoints,
             test_case_path=Path(test_case_path),
+            sub_agents_path=args.sub_agents,
         )
     except AgentNotReady as error:
         structlogger.error(

rasa/cli/evaluate.py

@@ -6,7 +6,7 @@ import rasa.cli.arguments.evaluate as arguments
 import rasa.shared.utils.cli
 from rasa import telemetry
 from rasa.cli import SubParsersAction
-from rasa.core.available_endpoints import AvailableEndpoints
+from rasa.core.config.configuration import Configuration
 from rasa.core.evaluation.marker_base import Marker, OperatorMarker
 from rasa.core.evaluation.marker_tracker_loader import MarkerTrackerLoader
 from rasa.core.tracker_stores.tracker_store import TrackerStore
@@ -217,6 +217,8 @@ def _create_tracker_loader(
         A MarkerTrackerLoader object configured with the specified strategy against
         the configured tracker store.
     """
-    endpoints = AvailableEndpoints.get_instance(endpoint_config)
+    endpoints = Configuration.initialise_endpoints(
+        endpoints_path=Path(endpoint_config)
+    ).endpoints
     tracker_store = TrackerStore.create(endpoints.tracker_store, domain=domain)
     return MarkerTrackerLoader(tracker_store, strategy, count, seed)

rasa/cli/export.py

@@ -11,13 +11,14 @@ from rasa import telemetry
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import export as arguments
 from rasa.core.brokers.pika import PikaEventBroker
+from rasa.core.config.configuration import Configuration
 from rasa.exceptions import PublishingError
 from rasa.shared.constants import DOCS_URL_EVENT_BROKERS, DOCS_URL_TRACKER_STORES
 from rasa.shared.exceptions import RasaException
 
 if typing.TYPE_CHECKING:
-    from rasa.core.available_endpoints import AvailableEndpoints
     from rasa.core.brokers.broker import EventBroker
+    from rasa.core.config.available_endpoints import AvailableEndpoints
     from rasa.core.exporter import Exporter
     from rasa.core.tracker_stores.tracker_store import TrackerStore
 
@@ -179,7 +180,9 @@ def export_trackers(args: argparse.Namespace) -> None:
 async def _export_trackers(args: argparse.Namespace) -> None:
     _assert_max_timestamp_is_greater_than_min_timestamp(args)
 
-    endpoints = rasa.core.utils.read_endpoints_from_path(args.endpoints)
+    endpoints = Configuration.initialise_endpoints(
+        endpoints_path=args.endpoints
+    ).endpoints
     tracker_store = _get_tracker_store(endpoints)
     event_broker = await _get_event_broker(endpoints)
     _prepare_event_broker(event_broker)

rasa/cli/inspect.py

@@ -1,6 +1,7 @@
 import argparse
 import webbrowser
 from asyncio import AbstractEventLoop
+from pathlib import Path
 from typing import List, Optional, Text
 
 from sanic import Sanic
@@ -8,8 +9,9 @@ from sanic import Sanic
 from rasa import telemetry
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import shell as arguments
+from rasa.cli.arguments.default_arguments import add_sub_agents_param
 from rasa.core import constants
-from rasa.core.available_endpoints import AvailableEndpoints
+from rasa.core.config.configuration import Configuration
 from rasa.engine.storage.local_model_storage import LocalModelStorage
 from rasa.exceptions import ModelNotFound
 from rasa.model import get_local_model
@@ -44,6 +46,8 @@ def add_subparser(
         "--voice", help="Enable voice", action="store_true", default=False
     )
 
+    add_sub_agents_param(inspect_parser)
+
     # it'd be confusing to expose those arguments to the user,
     # so we remove them
     remove_argument_from_parser(inspect_parser, "--credentials")
@@ -64,7 +68,7 @@ async def open_inspector_in_browser(
 def inspect(args: argparse.Namespace) -> None:
     """Inspect the bot using the most recent model."""
     import rasa.cli.run
-    from rasa.cli.utils import get_validated_path
+    from rasa.cli.validation.config_path_validation import get_validated_path
     from rasa.shared.constants import DEFAULT_MODELS_PATH
 
     async def after_start_hook_open_inspector(_: Sanic, __: AbstractEventLoop) -> None:
@@ -87,8 +91,9 @@ def inspect(args: argparse.Namespace) -> None:
     # Load endpoints with proper endpoint file location
     # This will initialise the endpoints singleton properly so that
     # it can be used safely throughout the codebase with
-    # `AvailableEndpoints.get_instance()`
-    AvailableEndpoints.get_instance(args.endpoints)
+    # `Configuration.get_instance().endpoints`
+    Configuration.initialise_endpoints(endpoints_path=Path(args.endpoints))
+    Configuration.initialise_sub_agents(args.sub_agents)
 
     try:
         model = get_local_model(model)

rasa/cli/interactive.py

@@ -11,6 +11,9 @@ import rasa.utils.common
 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 (
     ASSISTANT_ID_DEFAULT_VALUE,
@@ -109,6 +112,7 @@ def _set_not_required_args(args: argparse.Namespace) -> None:
     args.validation_max_history = None
     args.remote_storage = None
     args.keep_local_model_copy = False
+    args.sub_agents = DEFAULT_SUB_AGENTS  # Default value for sub-agents
 
 
 def perform_interactive_learning(
@@ -133,18 +137,18 @@ def perform_interactive_learning(
             "Can not run interactive learning on an NLU-only model."
         )
 
-    args.endpoints = rasa.cli.utils.get_validated_path(
+    args.endpoints = get_validated_path(
         args.endpoints, "endpoints", DEFAULT_ENDPOINTS_PATH, True
     )
 
+    Configuration.initialise_endpoints(endpoints_path=Path(args.endpoints))
+
     do_interactive_learning(args, file_importer)
 
 
 def get_provided_model(arg_model: Text) -> Optional[Union[Text, Path]]:
     """Checks model path input and selects model from it."""
-    model_path = rasa.cli.utils.get_validated_path(
-        arg_model, "model", DEFAULT_MODELS_PATH
-    )
+    model_path = get_validated_path(arg_model, "model", DEFAULT_MODELS_PATH)
 
     return (
         model.get_latest_model(model_path) if os.path.isdir(model_path) else model_path

rasa/cli/llm_fine_tuning.py

@@ -1,6 +1,7 @@
 import argparse
 import asyncio
 import sys
+from pathlib import Path
 from typing import Any, Dict, List, Type, cast
 
 import structlog
@@ -14,13 +15,15 @@ from rasa.cli.arguments.default_arguments import (
     add_endpoint_param,
     add_model_param,
     add_remote_storage_param,
+    add_sub_agents_param,
 )
 from rasa.cli.e2e_test import (
     RASA_PRO_BETA_FINE_TUNING_RECIPE_ENV_VAR_NAME,
     read_test_cases,
     validate_model_path,
 )
-from rasa.core.available_endpoints import AvailableEndpoints
+from rasa.core.config.available_endpoints import AvailableEndpoints
+from rasa.core.config.configuration import Configuration
 from rasa.core.exceptions import AgentNotReady
 from rasa.dialogue_understanding.generator.llm_based_command_generator import (
     LLMBasedCommandGenerator,
@@ -46,7 +49,6 @@ from rasa.llm_fine_tuning.train_test_split_module import (
     split_llm_fine_tuning_data,
 )
 from rasa.shared.constants import (
-    DEFAULT_ENDPOINTS_PATH,
     DEFAULT_MODELS_PATH,
     LLM_CONFIG_KEY,
 )
@@ -137,6 +139,8 @@ def add_data_preparation_arguments(parser: argparse.ArgumentParser) -> None:
         default=DEFAULT_INPUT_E2E_TEST_PATH,
     )
 
+    add_sub_agents_param(parser)
+
     add_remote_storage_param(parser)
 
     rephrasing_arguments = parser.add_argument_group("Rephrasing Module")
@@ -376,6 +380,7 @@ def write_params(
             "rephrase_config": rephrase_config,
             "model": args.model,
             "endpoints": args.endpoints,
+            "sub-agents": args.sub_agents,
             "remote-storage": args.remote_storage,
             "train_frac": args.train_frac,
             "output_format": args.output_format,
@@ -393,10 +398,9 @@ def write_statistics(statistics: Dict[str, Any], output_path: str) -> None:
 
 
 def get_valid_endpoints(endpoints_file: str) -> AvailableEndpoints:
-    validated_endpoints_file = rasa.cli.utils.get_validated_path(
-        endpoints_file, "endpoints", DEFAULT_ENDPOINTS_PATH, True
-    )
-    endpoints = AvailableEndpoints.get_instance(validated_endpoints_file)
+    endpoints = Configuration.initialise_endpoints(
+        endpoints_path=Path(endpoints_file)
+    ).endpoints
 
     # Ignore all endpoints apart from action server, model, nlu and nlg
     # to ensure InMemoryTrackerStore is being used instead of production
@@ -410,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)
@@ -420,6 +425,7 @@ def set_up_e2e_test_runner(args: argparse.Namespace) -> E2ETestRunner:
             model_path=args.model,
             model_server=endpoints.model,
             endpoints=endpoints,
+            sub_agents_path=args.sub_agents,
         )
     except AgentNotReady as error:
         structlogger.error(