rasa-pro 3.14.0.dev20250922__py3-none-any.whl → 3.14.0rc2__py3-none-any.whl

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
@@ -420,6 +424,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(

rasa/cli/project_templates/tutorial/credentials.yml

@@ -31,3 +31,13 @@ rest:
 # for the Rasa Enterprise "channel", i.e. Talk to your bot and Share with guest testers.
 rasa:
   url: "http://localhost:5002/api"
+
+# The Browser Audio channel enables voice interactions with your assistant directly in the browser.
+# Used by the Rasa Voice Inspector, it provides speech-to-text and text-to-speech capabilities
+# through services like Deepgram.
+browser_audio:
+  server_url: localhost
+  asr:
+    name: deepgram
+  tts:
+    name: deepgram

rasa/cli/run.py

@@ -7,12 +7,12 @@ from rasa.api import run as rasa_run
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import run as arguments
 from rasa.cli.arguments.default_arguments import SkipYamlValidation
-from rasa.cli.utils import get_validated_path
+from rasa.core.config.configuration import (
+    Configuration,
+)
 from rasa.exceptions import ModelNotFound
 from rasa.shared.constants import (
     DEFAULT_ACTIONS_PATH,
-    DEFAULT_CREDENTIALS_PATH,
-    DEFAULT_ENDPOINTS_PATH,
     DEFAULT_MODELS_PATH,
     DOCS_BASE_URL,
 )
@@ -86,11 +86,10 @@ def run(args: argparse.Namespace) -> None:
     Args:
         args: The CLI arguments.
     """
-    args.endpoints = get_validated_path(
-        args.endpoints, "endpoints", DEFAULT_ENDPOINTS_PATH, True
-    )
-    args.credentials = get_validated_path(
-        args.credentials, "credentials", DEFAULT_CREDENTIALS_PATH, True
+    Configuration.initialise_endpoints(
+        args.endpoints,
+    ).initialise_credentials(
+        args.credentials,
     )
 
     if SkipYamlValidation.DOMAIN.value in args.skip_yaml_validation:
@@ -109,7 +108,7 @@ def run(args: argparse.Namespace) -> None:
     # configured
 
     import rasa.model
-    from rasa.core.available_endpoints import AvailableEndpoints
+    from rasa.core.available_agents import AvailableAgents
 
     # start server if remote storage is configured
     if args.remote_storage is not None:
@@ -117,12 +116,15 @@ def run(args: argparse.Namespace) -> None:
         return
 
     # start server if model server is configured
-    endpoints = AvailableEndpoints.get_instance(args.endpoints)
+    endpoints = Configuration.get_instance().endpoints
     model_server = endpoints.model if endpoints and endpoints.model else None
     if model_server is not None:
         rasa_run(**vars(args))
         return
 
+    # load sub-agents
+    AvailableAgents.get_instance(args.sub_agents)
+
     # start server if local model found
     args.model = _validate_model_path(args.model, "model", DEFAULT_MODELS_PATH)
     local_model_set = True

rasa/cli/scaffold.py

@@ -104,10 +104,10 @@ def print_train_or_instructions(args: argparse.Namespace) -> None:
     if should_train:
         print_success("Training an initial model...")
         training_result = train(
-            template_domain_path[args.template],
-            DEFAULT_CONFIG_PATH,
-            DEFAULT_DATA_PATH,
-            DEFAULT_MODELS_PATH,
+            domain=template_domain_path[args.template],
+            config=DEFAULT_CONFIG_PATH,
+            training_files=DEFAULT_DATA_PATH,
+            output=DEFAULT_MODELS_PATH,
         )
         args.model = training_result.model
 

rasa/cli/shell.py

@@ -1,12 +1,14 @@
 import argparse
 import logging
 import uuid
+from pathlib import Path
 from typing import List
 
 from rasa import telemetry
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import shell as arguments
-from rasa.core.available_endpoints import AvailableEndpoints
+from rasa.cli.arguments.default_arguments import add_sub_agents_param
+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
@@ -45,6 +47,8 @@ def add_subparser(
         help="Set the conversation ID.",
     )
 
+    add_sub_agents_param(shell_parser)
+
     run_subparsers = shell_parser.add_subparsers()
 
     shell_nlu_subparser = run_subparsers.add_parser(
@@ -64,7 +68,7 @@ def add_subparser(
 def shell_nlu(args: argparse.Namespace) -> None:
     """Talk with an NLU only bot though the command line."""
     import rasa.nlu.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
 
     args.connector = "cmdline"
@@ -102,15 +106,15 @@ def shell_nlu(args: argparse.Namespace) -> None:
 
 def shell(args: argparse.Namespace) -> None:
     """Talk with a bot though the command line."""
-    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
 
     args.connector = "cmdline"
     # 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))
     model = get_validated_path(args.model, "model", DEFAULT_MODELS_PATH)
 
     try:

rasa/cli/studio/studio.py

@@ -12,7 +12,7 @@ import rasa.cli.studio.train
 import rasa.cli.studio.upload
 import rasa.shared.utils.cli
 from rasa.cli import SubParsersAction
-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_DOMAIN_PATH, DEFAULT_DOMAIN_PATHS
 from rasa.studio.auth import StudioAuth
 from rasa.studio.config import StudioConfig

rasa/cli/test.py

@@ -11,6 +11,13 @@ import rasa.shared.utils.io
 import rasa.utils.common
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import test as arguments
+from rasa.cli.validation.config_path_validation import get_validated_path
+from rasa.core.config.configuration import (
+    Configuration,
+    CredentialsConfigPath,
+    EndpointsConfigPath,
+    MessageProcessingConfigPath,
+)
 from rasa.core.constants import (
     FAILED_STORIES_FILE,
     STORIES_WITH_WARNINGS_FILE,
@@ -100,10 +107,16 @@ async def run_core_test_async(args: argparse.Namespace) -> None:
         test_core_models_in_directory,
     )
 
-    stories = rasa.cli.utils.get_validated_path(
-        args.stories, "stories", DEFAULT_DATA_PATH
+    Configuration.initialise_endpoints(
+        endpoints_path=EndpointsConfigPath.validate(),
+    ).initialise_credentials(
+        credentials_path=CredentialsConfigPath.validate()
+    ).initialise_message_processing(
+        message_processing_config_path=MessageProcessingConfigPath.validate()
     )
 
+    stories = get_validated_path(args.stories, "stories", DEFAULT_DATA_PATH)
+
     output = args.out or DEFAULT_RESULTS_PATH
     args.errors = not args.no_errors
     args.warnings = not args.no_warnings
@@ -121,9 +134,7 @@ async def run_core_test_async(args: argparse.Namespace) -> None:
         return
 
     if isinstance(args.model, str):
-        model_path = rasa.cli.utils.get_validated_path(
-            args.model, "model", DEFAULT_MODELS_PATH
-        )
+        model_path = get_validated_path(args.model, "model", DEFAULT_MODELS_PATH)
 
         if args.evaluate_model_directory:
             await test_core_models_in_directory(
@@ -182,9 +193,7 @@ async def run_nlu_test_async(
         test_nlu,
     )
 
-    data_path = str(
-        rasa.cli.utils.get_validated_path(data_path, "nlu", DEFAULT_DATA_PATH)
-    )
+    data_path = str(get_validated_path(data_path, "nlu", DEFAULT_DATA_PATH))
     test_data_importer = TrainingDataImporter.load_from_dict(
         training_data_paths=[data_path], domain_path=domain_path
     )
@@ -225,18 +234,29 @@ async def run_nlu_test_async(
         )
     elif cross_validation:
         logger.info("Test model using cross validation.")
-        # FIXME: supporting Union[Path, Text] down the chain
-        # is the proper fix and needs more work
-        config = str(
-            rasa.cli.utils.get_validated_path(config, "config", DEFAULT_CONFIG_PATH)
+
+        Configuration.initialise_endpoints(
+            endpoints_path=EndpointsConfigPath.validate(),
+        ).initialise_credentials(
+            credentials_path=CredentialsConfigPath.validate()
+        ).initialise_message_processing(
+            message_processing_config_path=MessageProcessingConfigPath.validate(config),
         )
+
+        config = str(get_validated_path(config, "config", DEFAULT_CONFIG_PATH))
         config_importer = TrainingDataImporter.load_from_dict(config_path=config)
 
         config_dict = config_importer.get_config()
         await perform_nlu_cross_validation(config_dict, nlu_data, output, all_args)
     else:
-        model_path = rasa.cli.utils.get_validated_path(
-            models_path, "model", DEFAULT_MODELS_PATH
+        model_path = get_validated_path(models_path, "model", DEFAULT_MODELS_PATH)
+
+        Configuration.initialise_endpoints(
+            endpoints_path=EndpointsConfigPath.validate(),
+        ).initialise_credentials(
+            credentials_path=CredentialsConfigPath.validate()
+        ).initialise_message_processing(
+            message_processing_config_path=MessageProcessingConfigPath.validate(config),
         )
 
         await test_nlu(model_path, data_path, output, all_args, domain_path=domain_path)

rasa/cli/train.py

@@ -7,10 +7,13 @@ from typing import Dict, List, Optional, Text, Union
 import structlog
 
 import rasa.cli.arguments.train as train_arguments
-import rasa.cli.utils
-import rasa.core.utils
-import rasa.utils.common
 from rasa.cli import SubParsersAction
+from rasa.cli.validation.bot_config import validate_files
+from rasa.cli.validation.config_path_validation import (
+    get_validated_config,
+    get_validated_path,
+)
+from rasa.core.config.configuration import Configuration
 from rasa.core.nlg.contextual_response_rephraser import ContextualResponseRephraser
 from rasa.core.nlg.generator import NaturalLanguageGenerator
 from rasa.core.train import do_compare_training
@@ -74,7 +77,9 @@ def add_subparser(
 
 def _check_nlg_endpoint_validity(endpoint: Union[Path, str]) -> None:
     try:
-        endpoints = rasa.core.utils.read_endpoints_from_path(endpoint)
+        endpoints = Configuration.initialise_endpoints(
+            endpoints_path=endpoint
+        ).endpoints
         if endpoints.nlg is not None:
             validate_api_type_config_key_usage(
                 endpoints.nlg.kwargs,
@@ -115,21 +120,17 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
     """
     from rasa.api import train as train_all
 
-    domain = rasa.cli.utils.get_validated_path(
+    domain = get_validated_path(
         args.domain, "domain", DEFAULT_DOMAIN_PATHS, none_is_valid=True
     )
-    config = rasa.cli.utils.get_validated_config(args.config, CONFIG_MANDATORY_KEYS)
+    config = get_validated_config(args.config, CONFIG_MANDATORY_KEYS)
 
     # Validates and loads 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()`
+    # TODO(Radovan): this should be probably be done in Configuration
     _check_nlg_endpoint_validity(args.endpoints)
 
     training_files = [
-        rasa.cli.utils.get_validated_path(
-            f, "data", DEFAULT_DATA_PATH, none_is_valid=True
-        )
+        get_validated_path(f, "data", DEFAULT_DATA_PATH, none_is_valid=True)
         for f in args.data
     ]
 
@@ -143,15 +144,17 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
             event_info="Started validating domain and training data...",
         )
 
-        rasa.cli.utils.validate_files(
+        validate_files(
             args.fail_on_validation_warnings,
             args.validation_max_history,
             training_data_importer,
+            sub_agents=args.sub_agents,
         )
 
     training_result = train_all(
         domain=domain,
         config=config,
+        endpoints=args.endpoints,
         training_files=training_files,
         output=args.out,
         dry_run=args.dry_run,
@@ -168,6 +171,7 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
         file_importer=training_data_importer,
         keep_local_model_copy=args.keep_local_model_copy,
         remote_root_only=args.remote_root_only,
+        sub_agents=args.sub_agents,
     )
     if training_result.code != 0 and can_exit:
         display_research_study_prompt()
@@ -177,13 +181,19 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
 
 
 def _model_for_finetuning(args: argparse.Namespace) -> Optional[Text]:
-    if args.finetune == train_arguments.USE_LATEST_MODEL_FOR_FINE_TUNING:
-        # We use this constant to signal that the user specified `--finetune` but
-        # didn't provide a path to a model. In this case we try to load the latest
-        # model from the output directory (that's usually models/).
-        return args.out
-    else:
-        return args.finetune
+    if args.finetune is not None:
+        structlogger.error(
+            "cli.train.incremental_training_not_supported",
+            event_info=(
+                "Incremental training (--finetune) is "
+                "not supported in Rasa 3.14.0 onwards. "
+                "Please retrain your model from scratch "
+                "if you have updated your configuration. "
+            ),
+        )
+        display_research_study_prompt()
+        sys.exit(1)
+    return None
 
 
 def run_core_training(args: argparse.Namespace) -> Optional[Text]:
@@ -197,10 +207,10 @@ def run_core_training(args: argparse.Namespace) -> Optional[Text]:
     """
     from rasa.model_training import train_core
 
-    args.domain = rasa.cli.utils.get_validated_path(
+    args.domain = get_validated_path(
         args.domain, "domain", DEFAULT_DOMAIN_PATHS, none_is_valid=True
     )
-    story_file = rasa.cli.utils.get_validated_path(
+    story_file = get_validated_path(
         args.stories, "stories", DEFAULT_DATA_PATH, none_is_valid=True
     )
     additional_arguments = {
@@ -213,9 +223,11 @@ def run_core_training(args: argparse.Namespace) -> Optional[Text]:
         if isinstance(args.config, list):
             args.config = args.config[0]
 
-        config = rasa.cli.utils.get_validated_config(
-            args.config, CONFIG_MANDATORY_KEYS_CORE
-        )
+        config = get_validated_config(args.config, CONFIG_MANDATORY_KEYS_CORE)
+
+        Configuration.initialise_message_processing(
+            message_processing_config_path=Path(config)
+        ).initialise_empty_endpoints()
 
         return asyncio.run(
             train_core(
@@ -231,6 +243,7 @@ def run_core_training(args: argparse.Namespace) -> Optional[Text]:
             )
         )
     else:
+        Configuration.initialise_empty()
         asyncio.run(do_compare_training(args, story_file, additional_arguments))
         return None
 
@@ -246,13 +259,13 @@ def run_nlu_training(args: argparse.Namespace) -> Optional[Text]:
     """
     from rasa.model_training import train_nlu
 
-    config = rasa.cli.utils.get_validated_config(args.config, CONFIG_MANDATORY_KEYS_NLU)
-    nlu_data = rasa.cli.utils.get_validated_path(
+    config = get_validated_config(args.config, CONFIG_MANDATORY_KEYS_NLU)
+    nlu_data = get_validated_path(
         args.nlu, "nlu", DEFAULT_DATA_PATH, none_is_valid=True
     )
 
     if args.domain:
-        args.domain = rasa.cli.utils.get_validated_path(
+        args.domain = get_validated_path(
             args.domain, "domain", DEFAULT_DOMAIN_PATHS, none_is_valid=True
         )