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

rasa/model_manager/warm_rasa_process.py

@@ -157,8 +157,8 @@ def warmup() -> None:
         import pandas  # noqa: F401
         import presidio_analyzer  # noqa: F401
         import spacy  # noqa: F401
-        import tensorflow  # noqa: F401
 
+        # import tensorflow
         import rasa.validator  # noqa: F401
     except ImportError:
         pass

rasa/model_training.py

@@ -145,22 +145,23 @@ def _check_unresolved_slots(domain: Domain, stories: StoryGraph) -> None:
 
 
 async def train(
-    domain: Text,
-    config: Text,
-    training_files: Optional[Union[Text, List[Text]]],
-    output: Text = rasa.shared.constants.DEFAULT_MODELS_PATH,
+    domain: str,
+    config: str,
+    training_files: Optional[Union[str, List[str]]],
+    output: str = rasa.shared.constants.DEFAULT_MODELS_PATH,
     dry_run: bool = False,
     force_training: bool = False,
-    fixed_model_name: Optional[Text] = None,
+    fixed_model_name: Optional[str] = None,
     persist_nlu_training_data: bool = False,
     core_additional_arguments: Optional[Dict] = None,
     nlu_additional_arguments: Optional[Dict] = None,
-    model_to_finetune: Optional[Text] = None,
+    model_to_finetune: Optional[str] = None,
     finetuning_epoch_fraction: float = 1.0,
     remote_storage: Optional[StorageType] = None,
     file_importer: Optional[TrainingDataImporter] = None,
     keep_local_model_copy: bool = False,
     remote_root_only: bool = False,
+    sub_agents: Optional[str] = None,
 ) -> TrainingResult:
     """Trains a Rasa model (Core and NLU).
 
@@ -190,6 +191,7 @@ async def train(
             remote storage is configured.
         remote_root_only: If `True`, the model will be stored in the root of the
             remote model storage.
+        sub_agents: Path to sub-agents directory.
 
     Returns:
         An instance of `TrainingResult`.

rasa/nlu/extractors/extractor.py

@@ -2,7 +2,8 @@ import abc
 from typing import Any, Dict, List, NamedTuple, Optional, Text, Tuple
 
 import rasa.shared.utils.io
-import rasa.utils.train_utils
+
+# import rasa.utils.train_utils
 from rasa.nlu.constants import (
     ENTITY_ATTRIBUTE_CONFIDENCE_GROUP,
     ENTITY_ATTRIBUTE_CONFIDENCE_ROLE,

rasa/plugin.py

@@ -37,7 +37,7 @@ def init_hooks(manager: pluggy.PluginManager) -> None:
     manager.register(hooks)
 
 
-@hookspec  # type: ignore[misc]
+@hookspec
 def refine_cli(
     subparsers: SubParsersAction,
     parent_parsers: List[argparse.ArgumentParser],
@@ -45,22 +45,22 @@ def refine_cli(
     """Customizable hook for adding CLI commands."""
 
 
-@hookspec  # type: ignore[misc]
+@hookspec
 def configure_commandline(cmdline_arguments: argparse.Namespace) -> Optional[Text]:
     """Hook specification for configuring plugin CLI."""
 
 
-@hookspec  # type: ignore[misc]
+@hookspec
 def init_telemetry(endpoints_file: Optional[Text]) -> None:
     """Hook specification for initialising plugin telemetry."""
 
 
-@hookspec  # type: ignore[misc]
+@hookspec
 def init_managers(endpoints_file: Optional[Text]) -> None:
     """Hook specification for initialising managers."""
 
 
-@hookspec(firstresult=True)  # type: ignore[misc]
+@hookspec(firstresult=True)
 def create_tracker_store(  # type: ignore[empty-body]
     endpoint_config: Union["TrackerStore", "EndpointConfig"],
     domain: "Domain",
@@ -69,7 +69,7 @@ def create_tracker_store(  # type: ignore[empty-body]
     """Hook specification for wrapping with AuthRetryTrackerStore."""
 
 
-@hookspec  # type: ignore[misc]
+@hookspec
 def after_server_stop() -> None:
     """Hook specification for stopping the server.
 
@@ -78,11 +78,11 @@ def after_server_stop() -> None:
     """
 
 
-@hookspec  # type: ignore[misc]
+@hookspec
 def after_new_user_message(tracker: "DialogueStateTracker") -> None:
     """Hook specification for after a new user message is received."""
 
 
-@hookspec  # type: ignore[misc]
+@hookspec
 def after_action_executed(tracker: "DialogueStateTracker") -> None:
     """Hook specification for after an action is executed."""

rasa/privacy/privacy_manager.py

@@ -264,10 +264,19 @@ class BackgroundPrivacyManager:
             )
             return None
 
-        latest_user_message = tracker.get_last_event_for(
+        latest_user_message_event = tracker.get_last_event_for(
             UserUttered, event_verbosity=EventVerbosity.ALL
         )
-        if latest_user_message is None or not latest_user_message.text:
+        if latest_user_message_event is None or not isinstance(
+            latest_user_message_event, UserUttered
+        ):
+            structlogger.debug(
+                "rasa.privacy_manager.no_user_message.skipping_processing",
+            )
+            return None
+
+        latest_user_message: UserUttered = latest_user_message_event
+        if not latest_user_message.text:
             structlogger.debug(
                 "rasa.privacy_manager.no_user_message.skipping_processing",
             )

rasa/server.py

@@ -44,6 +44,7 @@ import rasa.utils.endpoints
 import rasa.utils.io
 from rasa.constants import MINIMUM_COMPATIBLE_VERSION
 from rasa.core.agent import Agent
+from rasa.core.available_agents import AvailableAgents
 from rasa.core.available_endpoints import AvailableEndpoints
 from rasa.core.channels.channel import (
     CollectingOutputChannel,
@@ -243,7 +244,7 @@ def requires_auth(
         @wraps(f)
         async def decorated(
             request: Request, *args: Any, **kwargs: Any
-        ) -> response.HTTPResponse:
+        ) -> Union[response.HTTPResponse, Coroutine[Any, Any, response.HTTPResponse]]:
             provided = request.args.get("token", None)
 
             # noinspection PyProtectedMember
@@ -676,7 +677,9 @@ def inject_temp_dir(f: Callable[..., Coroutine]) -> Callable:
     """
 
     @wraps(f)
-    async def decorated_function(*args: Any, **kwargs: Any) -> HTTPResponse:
+    async def decorated_function(
+        *args: Any, **kwargs: Any
+    ) -> Union[HTTPResponse, Coroutine[Any, Any, HTTPResponse]]:
         with TempDirectoryPath(get_temp_dir_name()) as directory:
             # Decorated request handles need to have a parameter `temporary_directory`
             return await f(*args, temporary_directory=Path(directory), **kwargs)
@@ -693,6 +696,7 @@ def create_app(
     jwt_private_key: Optional[Text] = None,
     jwt_method: Text = "HS256",
     endpoints: Optional[AvailableEndpoints] = None,
+    sub_agents: Optional[AvailableAgents] = None,
     is_inspector_enabled: bool = False,
 ) -> Sanic:
     """Class representing a Rasa HTTP server."""
@@ -728,6 +732,7 @@ def create_app(
             user_id="username",
         )
 
+    app.ctx.sub_agents = sub_agents
     app.ctx.agent = agent
     # Initialize shared object of type unsigned int for tracking
     # the number of active training processes
@@ -1463,6 +1468,13 @@ def create_app(
         flows = await processor.get_flows()
         return response.json(flows.as_json_list())
 
+    @app.get("/sub-agents")
+    @requires_auth(app, auth_token)
+    async def get_sub_agents(request: Request) -> HTTPResponse:
+        """Get all the sub-agents currently stored by the agent."""
+        sub_agents = app.ctx.sub_agents
+        return response.json(sub_agents.as_json_list())
+
     @app.get("/domain")
     @requires_auth(app, auth_token)
     @ensure_loaded_agent(app)

rasa/shared/agents/utils.py

@@ -0,0 +1,35 @@
+from typing import Optional
+
+from rasa.agents.core.types import AgentIdentifier, ProtocolType
+from rasa.core.available_agents import AgentConfig, ProtocolConfig
+from rasa.shared.core.flows.steps import CallFlowStep
+
+
+def make_agent_identifier(
+    agent_name: str, protocol_type: ProtocolType
+) -> AgentIdentifier:
+    """Make an agent identifier."""
+    return AgentIdentifier(agent_name, protocol_type)
+
+
+def get_protocol_type(
+    step: CallFlowStep, agent_config: Optional[AgentConfig]
+) -> ProtocolType:
+    """Get the protocol type for an agent.
+
+    Args:
+        step: The step that is calling the agent.
+        agent_config: The agent configuration.
+
+    Returns:
+        The protocol type for the agent.
+    """
+    if step.exit_if:
+        protocol_type = ProtocolType.MCP_TASK
+    else:
+        protocol_type = (
+            ProtocolType.A2A
+            if agent_config and agent_config.agent.protocol == ProtocolConfig.A2A
+            else ProtocolType.MCP_OPEN
+        )
+    return protocol_type

rasa/shared/constants.py

@@ -249,6 +249,9 @@ _VALIDATE_ENVIRONMENT_MISSING_KEYS_KEY = "missing_keys"
 LLM_API_HEALTH_CHECK_ENV_VAR = "LLM_API_HEALTH_CHECK"
 LLM_API_HEALTH_CHECK_DEFAULT_VALUE = "false"
 
+MCP_API_HEALTH_CHECK_ENV_VAR = "MCP_API_HEALTH_CHECK"
+MCP_API_HEALTH_CHECK_DEFAULT_VALUE = "false"
+
 AWS_REGION_NAME_CONFIG_KEY = "aws_region_name"
 AWS_ACCESS_KEY_ID_CONFIG_KEY = "aws_access_key_id"
 AWS_SECRET_ACCESS_KEY_CONFIG_KEY = "aws_secret_access_key"
@@ -345,6 +348,8 @@ PAYLOAD = "payload"
 # Used for LLM command generation
 ROLE_USER = "user"
 ROLE_SYSTEM = "system"
+ROLE_ASSISTANT = "assistant"
+ROLE_TOOL = "tool"
 
 # Used for key values in ValidateSlotPatternFlowStackFrame
 REFILL_UTTER = "refill_utter"
@@ -359,3 +364,6 @@ FAQ_INPUT_DATA_QUESTION_LINE_PREFIX = "Q:"
 FAQ_INPUT_DATA_ANSWER_LINE_PREFIX = "A:"
 FAQ_DOCUMENT_ENTRY_SEPARATOR = "\n\n"
 FAQ_DOCUMENT_LINE_SEPARATOR = "\n"
+
+# Constants for the MCP server
+KEY_TOOL_CALLS = "tool_calls"

rasa/shared/core/constants.py

@@ -30,6 +30,7 @@ LOOP_NAME = "name"
 ACTION_LISTEN_NAME = "action_listen"
 ACTION_RESTART_NAME = "action_restart"
 ACTION_SEND_TEXT_NAME = "action_send_text"
+ACTION_AGENT_REQUEST_USER_INPUT_NAME = "action_agent_request_user_input"
 ACTION_SESSION_START_NAME = "action_session_start"
 ACTION_DEFAULT_FALLBACK_NAME = "action_default_fallback"
 ACTION_DEACTIVATE_LOOP_NAME = "action_deactivate_loop"
@@ -53,9 +54,16 @@ ACTION_RESET_ROUTING = "action_reset_routing"
 ACTION_HANGUP = "action_hangup"
 ACTION_REPEAT_BOT_MESSAGES = "action_repeat_bot_messages"
 
+# pattern continue interrupted flows
+ACTION_CONTINUE_INTERRUPTED_FLOW = "action_continue_interrupted_flow"
+ACTION_CANCEL_INTERRUPTED_FLOWS = "action_cancel_interrupted_flows"
+
+
 ACTION_METADATA_EXECUTION_SUCCESS = "execution_success"
 ACTION_METADATA_EXECUTION_ERROR_MESSAGE = "execution_error_message"
 
+ACTION_METADATA_MESSAGE_KEY = "message"
+ACTION_METADATA_TEXT_KEY = "text"
 
 DEFAULT_ACTION_NAMES = [
     ACTION_LISTEN_NAME,
@@ -70,6 +78,7 @@ DEFAULT_ACTION_NAMES = [
     ACTION_UNLIKELY_INTENT_NAME,
     ACTION_BACK_NAME,
     ACTION_SEND_TEXT_NAME,
+    ACTION_AGENT_REQUEST_USER_INPUT_NAME,
     RULE_SNIPPET_ACTION_NAME,
     ACTION_EXTRACT_SLOTS,
     ACTION_CANCEL_FLOW,
@@ -82,6 +91,8 @@ DEFAULT_ACTION_NAMES = [
     ACTION_RESET_ROUTING,
     ACTION_HANGUP,
     ACTION_REPEAT_BOT_MESSAGES,
+    ACTION_CONTINUE_INTERRUPTED_FLOW,
+    ACTION_CANCEL_INTERRUPTED_FLOWS,
 ]
 
 ACTION_SHOULD_SEND_DOMAIN = "send_domain"
@@ -136,7 +147,6 @@ DEFAULT_SLOT_NAMES = {
     FLOW_HASHES_SLOT,
 }
 
-
 SLOT_MAPPINGS = "mappings"
 MAPPING_CONDITIONS = "conditions"
 KEY_MAPPING_TYPE = "type"

rasa/shared/core/domain.py

@@ -98,8 +98,6 @@ IS_RETRIEVAL_INTENT_KEY = "is_retrieval_intent"
 ENTITY_ROLES_KEY = "roles"
 ENTITY_GROUPS_KEY = "groups"
 ENTITY_FEATURIZATION_KEY = "influence_conversation"
-STORE_ENTITIES_AS_SLOTS_KEY = "store_entities_as_slots"
-DOMAIN_CONFIG_KEY = "config"
 
 KEY_SLOTS = "slots"
 KEY_INTENTS = "intents"
@@ -148,8 +146,6 @@ MERGE_FUNC_MAPPING: Dict[Text, Callable[..., Any]] = {
     KEY_FORMS: rasa.shared.utils.common.merge_dicts,
 }
 
-DEFAULT_STORE_ENTITIES_AS_SLOTS = True
-
 DICT_DATA_KEYS = [
     key
     for key, value in MERGE_FUNC_MAPPING.items()
@@ -322,7 +318,7 @@ class Domain:
         actions = cls._collect_action_names(domain_actions)
 
         additional_arguments = {
-            **data.get(DOMAIN_CONFIG_KEY, {}),
+            **data.get("config", {}),
             "actions_which_explicitly_need_domain": (
                 cls._collect_actions_which_explicitly_need_domain(domain_actions)
             ),
@@ -472,9 +468,9 @@ class Domain:
             return domain_dict
 
         if override:
-            config = domain_dict.get(DOMAIN_CONFIG_KEY, {})
+            config = domain_dict.get("config", {})
             for key, val in config.items():
-                combined[DOMAIN_CONFIG_KEY][key] = val
+                combined["config"][key] = val
 
         if (
             override
@@ -514,8 +510,8 @@ class Domain:
     def partial_merge(self, other: Domain) -> Domain:
         """Returns a new Domain with intersection-based merging.
 
-        For each domain section only overwrite items that already exist in self.
-        Brand-new items in `other` are ignored.
+          - For each domain section only overwrite items that already exist in self.
+          - Brand-new items in `other` are ignored.
 
         Args:
             other: The domain to merge with.
@@ -549,7 +545,7 @@ class Domain:
     def difference(self, other: Domain) -> Domain:
         """Returns a new Domain containing items in `self` that are NOT in `other`.
 
-        Uses simple equality checks for dict/list items.
+        Simple using equality checks for dict/list items.
 
         Args:
             other: The domain to compare with.
@@ -602,16 +598,9 @@ class Domain:
     ) -> Dict:
         # add the config, session_config and training data version defaults
         # if not included in the original domain dict
-        if (
-            DOMAIN_CONFIG_KEY not in data
-            and store_entities_as_slots != DEFAULT_STORE_ENTITIES_AS_SLOTS
-        ):
+        if "config" not in data and not store_entities_as_slots:
             data.update(
-                {
-                    DOMAIN_CONFIG_KEY: {
-                        STORE_ENTITIES_AS_SLOTS_KEY: store_entities_as_slots
-                    }
-                }
+                {"config": {"store_entities_as_slots": store_entities_as_slots}}
             )
 
         if SESSION_CONFIG_KEY not in data:
@@ -948,7 +937,7 @@ class Domain:
         forms: Union[Dict[Text, Any], List[Text]],
         data: Dict,
         action_texts: Optional[List[Text]] = None,
-        store_entities_as_slots: bool = DEFAULT_STORE_ENTITIES_AS_SLOTS,
+        store_entities_as_slots: bool = True,
         session_config: SessionConfig = SessionConfig.default(),
         **kwargs: Any,
     ) -> None:
@@ -1722,45 +1711,9 @@ class Domain:
         else:
             return True
 
-    def _uses_custom_session_config(self) -> bool:
-        """Check if the domain uses a custom session config."""
-        return self._data.get(SESSION_CONFIG_KEY) != SessionConfig.default().as_dict()
-
-    def _uses_custom_domain_config(self) -> bool:
-        """Check if the domain uses a custom domain config."""
-        return self._data.get(DOMAIN_CONFIG_KEY) != {
-            STORE_ENTITIES_AS_SLOTS_KEY: DEFAULT_STORE_ENTITIES_AS_SLOTS
-        }
-
-    def _cleaned_json_data(self) -> Dict[Text, Any]:
-        """Remove default values from the domain data.
-
-        Only retains data that was customized by the user.
-
-        Returns:
-            A cleaned dictionary version of the domain.
-        """
-        cleaned_data = copy.deepcopy(self._data)
-
-        # Remove default config if it only contains store_entities_as_slots: False
-        if DOMAIN_CONFIG_KEY in cleaned_data and not self._uses_custom_domain_config():
-            del cleaned_data[DOMAIN_CONFIG_KEY]
-
-        # Remove default session config if it matches the default values
-        if (
-            SESSION_CONFIG_KEY in cleaned_data
-            and not self._uses_custom_session_config()
-        ):
-            del cleaned_data[SESSION_CONFIG_KEY]
-
-        return cleaned_data
-
-    def as_dict(self, should_clean_json: bool = False) -> Dict[Text, Any]:
+    def as_dict(self) -> Dict[Text, Any]:
         """Return serialized `Domain`."""
-        if should_clean_json:
-            return self._cleaned_json_data()
-        else:
-            return self._data
+        return self._data
 
     @staticmethod
     def get_responses_with_multilines(