rasa-pro 3.14.0.dev5__py3-none-any.whl → 3.14.0.dev7__py3-none-any.whl

rasa/cli/interactive.py

@@ -11,6 +11,7 @@ import rasa.utils.common
 from rasa import model
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import interactive as arguments
+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 +110,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(

rasa/cli/llm_fine_tuning.py

@@ -14,6 +14,7 @@ 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,
@@ -137,6 +138,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 +379,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,
@@ -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/config.yml

@@ -1,6 +1,5 @@
 recipe: default.v1
 language: en
-assistant_id: placeholder_default
 pipeline:
 - name: CompactLLMCommandGenerator
   llm:
@@ -10,4 +9,4 @@ pipeline:
 
 policies:
   - name: FlowPolicy
-#  - name: EnterpriseSearchPolicy
+#  - name: EnterpriseSearchPolicy

rasa/cli/run.py

@@ -109,6 +109,7 @@ def run(args: argparse.Namespace) -> None:
     # configured
 
     import rasa.model
+    from rasa.core.available_agents import AvailableAgents
     from rasa.core.available_endpoints import AvailableEndpoints
 
     # start server if remote storage is configured
@@ -123,6 +124,9 @@ def run(args: argparse.Namespace) -> 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

@@ -5,9 +5,6 @@ from collections import defaultdict
 from enum import Enum
 from typing import List, Text
 
-import randomname
-import structlog
-
 from rasa import telemetry
 from rasa.api import train
 from rasa.cli import SubParsersAction
@@ -19,38 +16,21 @@ from rasa.shared.constants import (
     DEFAULT_MODELS_PATH,
     DOCS_BASE_URL,
 )
-from rasa.shared.utils import yaml
 from rasa.shared.utils.cli import print_error_and_exit, print_success
 
-structlogger = structlog.get_logger(__name__)
-
 
 class ProjectTemplateName(Enum):
     """Enum of CALM project templates."""
 
     DEFAULT = "default"
     TUTORIAL = "tutorial"
-    BASIC = "basic"
-    FINANCE = "finance"
-    TELCO = "telco"
 
     def __str__(self) -> str:
         return self.value
 
-    @classmethod
-    def get_all_values(cls) -> List[str]:
-        return [name.value for name in cls]
-
-    @classmethod
-    def supported_values(cls) -> str:
-        return ", ".join(cls.get_all_values())
-
 
 template_domain_path = defaultdict(lambda: DEFAULT_DOMAIN_PATH)
 template_domain_path[ProjectTemplateName.DEFAULT] = "domain"
-template_domain_path[ProjectTemplateName.BASIC] = "domain"
-template_domain_path[ProjectTemplateName.FINANCE] = "domain"
-template_domain_path[ProjectTemplateName.TELCO] = "domain"
 
 
 def add_subparser(
@@ -179,33 +159,9 @@ def create_initial_project(
     path: Text, template: ProjectTemplateName = ProjectTemplateName.DEFAULT
 ) -> None:
     """Creates directory structure and templates for initial project."""
-    import distutils.dir_util as dir_util
-
-    # clear the cache of the copy_tree function, this avoids issues if
-    # a project directory existed before and we removed folders in it
-    # with shutil.rmtree. see
-    # https://stackoverflow.com/questions/9160227/dir-util-copy-tree-fails-after-shutil-rmtree
-    if hasattr(dir_util, "_path_created"):
-        dir_util._path_created.clear()
-    else:
-        dir_util.SkipRepeatAbsolutePaths.clear()  # type: ignore[attr-defined]
-    dir_util.copy_tree(scaffold_path(template), path)
+    from distutils.dir_util import copy_tree
 
-    create_random_assistant_id(path)
-
-
-def create_random_assistant_id(path: Text) -> None:
-    """Create a random assistant id."""
-    assistant_id = f"{randomname.get_name()}"
-    config = yaml.read_yaml_file(os.path.join(path, "config.yml"))
-
-    if isinstance(config, dict):
-        config["assistant_id"] = assistant_id
-        yaml.write_yaml(config, os.path.join(path, "config.yml"))
-    else:
-        structlogger.warning(
-            "cli.scaffold.create_random_assistant_id.invalid_config", config=config
-        )
+    copy_tree(scaffold_path(template), path)
 
 
 def scaffold_path(template: ProjectTemplateName) -> Text:

rasa/cli/shell.py

@@ -6,6 +6,7 @@ from typing import List
 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.available_endpoints import AvailableEndpoints
 from rasa.engine.storage.local_model_storage import LocalModelStorage
 from rasa.exceptions import ModelNotFound
@@ -45,6 +46,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(

rasa/cli/train.py

@@ -147,6 +147,7 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
             args.fail_on_validation_warnings,
             args.validation_max_history,
             training_data_importer,
+            sub_agents=args.sub_agents,
         )
 
     training_result = train_all(
@@ -168,6 +169,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()

rasa/cli/utils.py

@@ -11,9 +11,9 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Text, Union, overlo
 import randomname
 import structlog
 
-import rasa.shared.utils.cli
 import rasa.shared.utils.io
 from rasa import telemetry
+from rasa.agents.validation import validate_agent_folder
 from rasa.exceptions import ModelNotFound, ValidationError
 from rasa.shared.constants import (
     ASSISTANT_ID_DEFAULT_VALUE,
@@ -257,6 +257,7 @@ def validate_files(
     stories_only: bool = False,
     flows_only: bool = False,
     translations_only: bool = False,
+    sub_agents: Optional[str] = None,
 ) -> None:
     """Validates either the story structure or the entire project.
 
@@ -267,6 +268,7 @@ def validate_files(
         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.
+        sub_agents: Path to sub-agents directory for validation.
     """
     from rasa.validator import Validator
 
@@ -302,6 +304,9 @@ def validate_files(
             valid_translations = True
         valid_CALM_slot_mappings = validator.validate_CALM_slot_mappings()
 
+        # Validate sub-agents if specified
+        valid_sub_agents = _validate_sub_agents(sub_agents) if sub_agents else True
+
         all_good = (
             valid_domain
             and valid_nlu
@@ -309,6 +314,7 @@ def validate_files(
             and valid_flows
             and valid_translations
             and valid_CALM_slot_mappings
+            and valid_sub_agents
         )
 
     if validator.config:
@@ -352,6 +358,84 @@ def _validate_domain(validator: "Validator") -> bool:
     )
 
 
+def _validate_sub_agents(sub_agents_path: str) -> bool:
+    """Validates sub-agents configuration.
+
+    Args:
+        sub_agents_path: Path to the sub-agents directory.
+
+    Returns:
+        True if validation passes, False otherwise.
+    """
+    try:
+        # Check if the sub-agents directory exists
+        if not os.path.isdir(sub_agents_path):
+            # If the sub-agents-path points to the default folder and it doesn't exist,
+            # no agents are available.
+            # AvailableAgents will handle the non-existing folder gracefully.
+            from rasa.core.constants import DEFAULT_SUB_AGENTS
+
+            if sub_agents_path == DEFAULT_SUB_AGENTS:
+                structlogger.info(
+                    "cli.validate_files.sub_agents_validation",
+                    sub_agents_path=sub_agents_path,
+                    event_info="Default sub-agents directory does not exist, "
+                    "no sub-agents will be available.",
+                )
+                return True
+            else:
+                # For user-specified paths, the directory must exist
+                structlogger.error(
+                    "cli.validate_files.sub_agents_validation_error",
+                    sub_agents_path=sub_agents_path,
+                    event_info=f"Sub-agents directory '{sub_agents_path}' "
+                    "does not exist.",
+                )
+                return False
+
+        # Validate the actual config content using AvailableAgents
+        # This will validate file existence, structure, mandatory keys, etc.
+        try:
+            validate_agent_folder(sub_agents_path)
+
+        except ValidationError as e:
+            # This is a validation error - log it and return False
+            structlogger.error(
+                "cli.validate_files.sub_agents_validation_error",
+                sub_agents_path=sub_agents_path,
+                validation_error=str(e),
+                event_info=f"Sub-agents configuration validation failed: {e}",
+            )
+            return False
+
+        except Exception as e:
+            # This is an unexpected error
+            structlogger.error(
+                "cli.validate_files.sub_agents_validation_error",
+                sub_agents_path=sub_agents_path,
+                error=str(e),
+                event_info=f"Unexpected error during sub-agents validation: {e}",
+            )
+            return False
+
+        structlogger.info(
+            "cli.validate_files.sub_agents_validation_success",
+            sub_agents_path=sub_agents_path,
+            event_info="Sub-agents validation passed successfully.",
+        )
+        return True
+
+    except Exception as e:
+        # This is an unexpected error
+        structlogger.error(
+            "cli.validate_files.sub_agents_validation_error",
+            sub_agents_path=sub_agents_path,
+            error=str(e),
+            event_info="Sub-agents validation failed.",
+        )
+        return False
+
+
 def _validate_nlu(validator: "Validator", fail_on_warnings: bool) -> bool:
     return validator.verify_nlu(not fail_on_warnings)
 

rasa/constants.py

@@ -22,8 +22,14 @@ MINIMUM_COMPATIBLE_VERSION = "3.11.0rc1"
 
 GLOBAL_USER_CONFIG_PATH = os.path.expanduser("~/.config/rasa/global.yml")
 
+# Logging level for external libraries (default: ERROR to reduce noise)
 DEFAULT_LOG_LEVEL_LIBRARIES = "ERROR"
 ENV_LOG_LEVEL_LIBRARIES = "LOG_LEVEL_LIBRARIES"
+
+# MCP (Model Context Protocol) logging configuration
+ENV_LOG_LEVEL_MCP = "LOG_LEVEL_MCP"
+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"

rasa/core/actions/action.py

@@ -47,6 +47,7 @@ from rasa.shared.constants import (
     UTTER_PREFIX,
 )
 from rasa.shared.core.constants import (
+    ACTION_AGENT_REQUEST_USER_INPUT_NAME,
     ACTION_BACK_NAME,
     ACTION_DEACTIVATE_LOOP_NAME,
     ACTION_DEFAULT_ASK_AFFIRMATION_NAME,
@@ -56,6 +57,8 @@ from rasa.shared.core.constants import (
     ACTION_LISTEN_NAME,
     ACTION_METADATA_EXECUTION_ERROR_MESSAGE,
     ACTION_METADATA_EXECUTION_SUCCESS,
+    ACTION_METADATA_MESSAGE_KEY,
+    ACTION_METADATA_TEXT_KEY,
     ACTION_RESET_ROUTING,
     ACTION_RESTART_NAME,
     ACTION_REVERT_FALLBACK_EVENTS_NAME,
@@ -88,7 +91,12 @@ from rasa.shared.core.slot_mappings import (
 )
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.exceptions import RasaException
-from rasa.shared.nlu.constants import INTENT_NAME_KEY, INTENT_RANKING_KEY
+from rasa.shared.nlu.constants import (
+    INTENT,
+    INTENT_NAME_KEY,
+    INTENT_RANKING_KEY,
+    PREDICTED_CONFIDENCE_KEY,
+)
 from rasa.shared.utils.io import raise_warning
 from rasa.shared.utils.schemas.events import EVENTS_SCHEMA
 from rasa.utils.endpoints import EndpointConfig
@@ -113,6 +121,10 @@ def default_actions(action_endpoint: Optional[EndpointConfig] = None) -> List["A
     from rasa.core.actions.two_stage_fallback import TwoStageFallbackAction
     from rasa.dialogue_understanding.patterns.cancel import ActionCancelFlow
     from rasa.dialogue_understanding.patterns.clarify import ActionClarifyFlows
+    from rasa.dialogue_understanding.patterns.continue_interrupted import (
+        ActionCancelInterruptedFlows,
+        ActionContinueInterruptedFlow,
+    )
     from rasa.dialogue_understanding.patterns.correction import ActionCorrectFlowSlot
 
     return [
@@ -127,6 +139,7 @@ def default_actions(action_endpoint: Optional[EndpointConfig] = None) -> List["A
         TwoStageFallbackAction(action_endpoint),
         ActionUnlikelyIntent(),
         ActionSendText(),
+        ActionAgentRequestUserInfo(),
         ActionBack(),
         ActionExtractSlots(action_endpoint),
         ActionCancelFlow(),
@@ -139,6 +152,8 @@ def default_actions(action_endpoint: Optional[EndpointConfig] = None) -> List["A
         ActionResetRouting(),
         ActionHangup(),
         ActionRepeatBotMessages(),
+        ActionContinueInterruptedFlow(),
+        ActionCancelInterruptedFlows(),
     ]
 
 
@@ -873,8 +888,8 @@ class RemoteAction(Action):
     ) -> List[BotUttered]:
         """Use the responses generated by the action endpoint and utter them."""
         bot_messages = []
-        domain: Domain = kwargs.get("domain", None)
-        action_name: str = kwargs.get("action_name", None)
+        domain: Optional[Domain] = kwargs.get("domain", None)
+        action_name: Optional[str] = kwargs.get("action_name", None)
         for response in responses:
             generated_response = response.pop("response", None)
             if generated_response is not None:
@@ -897,6 +912,7 @@ class RemoteAction(Action):
                 draft.setdefault("buttons", [])
                 draft["buttons"].extend(buttons)
 
+            # Avoid overwriting `draft` values with empty values
             response = {k: v for k, v in response.items() if v}
             response.update(draft)
             bot_messages.append(create_bot_utterance(response))
@@ -1014,13 +1030,13 @@ def _revert_affirmation_events(tracker: "DialogueStateTracker") -> List[Event]:
         revert_events += _revert_rephrasing_events()
 
     last_user_event = tracker.get_last_event_for(UserUttered)
-    if not last_user_event:
-        raise TypeError("Cannot find last event to revert to.")
+    if not last_user_event or not isinstance(last_user_event, UserUttered):
+        raise TypeError("Cannot find last user uttered event to revert to.")
 
     last_user_event = copy.deepcopy(last_user_event)
     # FIXME: better type annotation for `parse_data` would require
     # a larger refactoring (e.g. switch to dataclass)
-    last_user_event.parse_data["intent"]["confidence"] = 1.0  # type: ignore[typeddict-item]
+    last_user_event.parse_data[INTENT][PREDICTED_CONFIDENCE_KEY] = 1.0  # type: ignore[literal-required]
 
     return revert_events + [last_user_event]
 
@@ -1037,8 +1053,8 @@ def _revert_single_affirmation_events() -> List[Event]:
 
 def _revert_successful_rephrasing(tracker: "DialogueStateTracker") -> List[Event]:
     last_user_event = tracker.get_last_event_for(UserUttered)
-    if not last_user_event:
-        raise TypeError("Cannot find last event to revert to.")
+    if not last_user_event or not isinstance(last_user_event, UserUttered):
+        raise TypeError("Cannot find last user uttered event to revert to.")
 
     last_user_event = copy.deepcopy(last_user_event)
     return _revert_rephrasing_events() + [last_user_event]
@@ -1138,9 +1154,9 @@ class ActionSendText(Action):
         metadata: Optional[Dict[Text, Any]] = None,
     ) -> List[Event]:
         """Runs action. Please see parent class for the full docstring."""
-        fallback = {"text": ""}
+        fallback = {ACTION_METADATA_TEXT_KEY: ""}
         metadata_copy = copy.deepcopy(metadata) if metadata else {}
-        message = metadata_copy.get("message", fallback)
+        message = metadata_copy.get(ACTION_METADATA_MESSAGE_KEY, fallback)
 
         should_send_text = metadata_copy.get("should_send_text", True)
         if should_send_text:
@@ -1148,6 +1164,32 @@ class ActionSendText(Action):
         return []
 
 
+class ActionAgentRequestUserInfo(Action):
+    """Sends a text message to the output channel that requests some user information.
+
+    The difference to `ActionSendText` is that this action will pause the main advancing
+    flow loop until the user responds to the request
+    (`should_predict_another_action` will return False for this action).
+    """
+
+    def name(self) -> Text:
+        return ACTION_AGENT_REQUEST_USER_INPUT_NAME
+
+    async def run(
+        self,
+        output_channel: "OutputChannel",
+        nlg: "NaturalLanguageGenerator",
+        tracker: "DialogueStateTracker",
+        domain: "Domain",
+        metadata: Optional[Dict[Text, Any]] = None,
+    ) -> List[Event]:
+        """Runs action. Please see parent class for the full docstring."""
+        fallback = {ACTION_METADATA_TEXT_KEY: ""}
+        metadata_copy = copy.deepcopy(metadata) if metadata else {}
+        message = metadata_copy.get(ACTION_METADATA_MESSAGE_KEY, fallback)
+        return [create_bot_utterance(message)]
+
+
 class ActionExtractSlots(Action):
     """Default action that runs after each user turn.
 

rasa/core/agent.py

@@ -12,7 +12,9 @@ import aiohttp
 from aiohttp import ClientError
 
 import rasa.shared.utils.io
+from rasa.agents.utils import initialize_agents
 from rasa.core import jobs
+from rasa.core.available_agents import AvailableAgents
 from rasa.core.available_endpoints import AvailableEndpoints
 from rasa.core.channels.channel import OutputChannel, UserMessage
 from rasa.core.constants import DEFAULT_REQUEST_TIMEOUT
@@ -34,7 +36,7 @@ from rasa.privacy.privacy_manager import BackgroundPrivacyManager
 from rasa.shared.constants import DEFAULT_SENDER_ID
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.trackers import DialogueStateTracker, EventVerbosity
-from rasa.shared.exceptions import RasaException
+from rasa.shared.exceptions import AgentInitializationException, RasaException
 from rasa.telemetry import track_privacy_enabled
 from rasa.utils.common import TempDirectoryPath, get_temp_dir_name
 from rasa.utils.endpoints import EndpointConfig
@@ -202,6 +204,7 @@ async def load_agent(
     model_server: Optional[EndpointConfig] = None,
     remote_storage: Optional[StorageType] = None,
     endpoints: Optional[AvailableEndpoints] = None,
+    sub_agents: Optional[AvailableAgents] = None,
     loop: Optional[AbstractEventLoop] = None,
 ) -> Agent:
     """Loads agent from server, remote storage or disk.
@@ -211,6 +214,7 @@ async def load_agent(
         model_server: Configuration for a potential server which serves the model.
         remote_storage: Remote storage to use for loading the model.
         endpoints: Endpoint configuration.
+        sub_agents: Sub-agents configuration.
         loop: Optional async loop to pass to broker creation.
 
     Returns:
@@ -281,8 +285,20 @@ async def load_agent(
                 "No valid configuration given to load agent. "
                 "Agent loaded with no model!"
             )
+
+        if agent.processor:
+            flows = await agent.processor.get_flows()
+            domain = agent.processor.domain
+            # CLI commands that accept --sub-agents
+            # all route through this entry point.
+            # With all required data available,
+            # this is the best spot to initialize the subagents.
+            await initialize_agents(flows, domain, sub_agents)
+
         return agent
 
+    except AgentInitializationException as e:
+        raise e
     except Exception as e:
         logger.error(f"Could not load model due to {e}.", exc_info=True)
         return agent
@@ -322,6 +338,7 @@ class Agent:
         remote_storage: Optional[StorageType] = None,
         http_interpreter: Optional[RasaNLUHttpInterpreter] = None,
         endpoints: Optional[AvailableEndpoints] = None,
+        sub_agents: Optional[AvailableAgents] = None,
         privacy_manager: Optional[BackgroundPrivacyManager] = None,
     ):
         """Initializes an `Agent`."""
@@ -334,6 +351,7 @@ class Agent:
         self.action_endpoint = action_endpoint
         self.http_interpreter = http_interpreter
         self.endpoints = endpoints
+        self.sub_agents = sub_agents
 
         self._set_fingerprint(fingerprint)
         self.model_server = model_server