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

rasa/model_manager/socket_bridge.py

@@ -19,7 +19,7 @@ socket_proxy_clients = {}
 
 
 async def socketio_websocket_traffic_wrapper(
-    sio: AsyncServer,
+    sio_server: AsyncServer,
     running_bots: Dict[str, BotSession],
     sid: str,
     auth: Optional[Dict],
@@ -55,7 +55,9 @@ async def socketio_websocket_traffic_wrapper(
         structlogger.error("model_runner.bot_not_alive", deployment_id=deployment_id)
         raise ConnectionRefusedError("model_runner.bot_not_alive")
 
-    client = await create_bridge_client(sio, bot.internal_url, sid, deployment_id)
+    client = await create_bridge_client(
+        sio_server, bot.internal_url, sid, deployment_id
+    )
 
     if client.sid is not None:
         structlogger.debug(
@@ -70,20 +72,24 @@ async def socketio_websocket_traffic_wrapper(
         raise ConnectionRefusedError("model_runner.bot_connection_failed")
 
 
-def create_bridge_server(sio: AsyncServer, running_bots: Dict[str, BotSession]) -> None:
+def create_bridge_server(
+    sio_server: AsyncServer, running_bots: Dict[str, BotSession]
+) -> None:
     """Create handlers for the socket server side.
 
     Forwards messages coming from the user to the bot.
     """
 
-    @sio.on("connect")
+    @sio_server.on("connect")
     async def socketio_websocket_traffic(
         sid: str, environ: Dict, auth: Optional[Dict]
     ) -> bool:
         """Bridge websockets between user chat socket and bot server."""
-        return await socketio_websocket_traffic_wrapper(sio, running_bots, sid, auth)
+        return await socketio_websocket_traffic_wrapper(
+            sio_server, running_bots, sid, auth
+        )
 
-    @sio.on("disconnect")
+    @sio_server.on("disconnect")
     async def disconnect(sid: str) -> None:
         """Disconnect the bot connection."""
         structlogger.debug("model_runner.bot_disconnect", sid=sid)
@@ -91,7 +97,7 @@ def create_bridge_server(sio: AsyncServer, running_bots: Dict[str, BotSession])
             await socket_proxy_clients[sid].disconnect()
             del socket_proxy_clients[sid]
 
-    @sio.on("*")
+    @sio_server.on("*")
     async def handle_message(event: str, sid: str, data: Dict[str, Any]) -> None:
         """Bridge messages between user and bot.
 
@@ -108,7 +114,7 @@ def create_bridge_server(sio: AsyncServer, running_bots: Dict[str, BotSession])
 
 
 async def create_bridge_client(
-    sio: AsyncServer, url: str, sid: str, deployment_id: str
+    sio_server: AsyncServer, url: str, sid: str, deployment_id: str
 ) -> AsyncClient:
     """Create a new socket bridge client.
 
@@ -123,36 +129,36 @@ async def create_bridge_client(
         structlogger.debug(
             "model_runner.bot_session_confirmed", deployment_id=deployment_id
         )
-        await sio.emit("session_confirm", room=sid)
+        await sio_server.emit("session_confirm", room=sid)
 
     @client.event  # type: ignore[misc]
     async def bot_message(data: Dict[str, Any]) -> None:
         structlogger.debug("model_runner.bot_message", deployment_id=deployment_id)
-        await sio.emit("bot_message", data, room=sid)
+        await sio_server.emit("bot_message", data, room=sid)
 
     @client.event  # type: ignore[misc]
     async def error(data: Dict[str, Any]) -> None:
         structlogger.debug(
             "model_runner.bot_error", deployment_id=deployment_id, data=data
         )
-        await sio.emit("error", data, room=sid)
+        await sio_server.emit("error", data, room=sid)
 
     @client.event  # type: ignore[misc]
     async def tracker(data: Dict[str, Any]) -> None:
-        await sio.emit("tracker", json.loads(data), room=sid)
+        await sio_server.emit("tracker", json.loads(data), room=sid)
 
     @client.event  # type: ignore[misc]
     async def disconnect() -> None:
         structlogger.debug(
             "model_runner.bot_connection_closed", deployment_id=deployment_id
         )
-        await sio.emit("disconnect", room=sid)
+        await sio_server.emit("disconnect", room=sid)
 
     @client.event  # type: ignore[misc]
     async def connect_error() -> None:
         structlogger.error(
             "model_runner.bot_connection_error", deployment_id=deployment_id
         )
-        await sio.emit("disconnect", room=sid)
+        await sio_server.emit("disconnect", room=sid)
 
     return client

rasa/model_manager/trainer_service.py

@@ -14,7 +14,6 @@ from rasa.model_manager.utils import (
     ensure_base_directory_exists,
     logs_path,
     models_base_path,
-    subpath,
     write_encoded_data_to_file,
 )
 from rasa.model_manager.warm_rasa_process import (
@@ -22,6 +21,7 @@ from rasa.model_manager.warm_rasa_process import (
 )
 from rasa.model_training import generate_random_model_name
 from rasa.studio.prompts import handle_prompts
+from rasa.utils.io import subpath
 
 structlogger = structlog.get_logger()
 
@@ -53,6 +53,15 @@ class TrainingSession(BaseModel):
         """Check if the training is running."""
         return self.status == TrainingSessionStatus.RUNNING
 
+    def has_just_finished(self) -> bool:
+        if not self.is_status_indicating_alive():
+            # skip if the training is not running
+            return False
+        if self.process.poll() is None:
+            # process is still running
+            return False
+        return True
+
     def model_path(self) -> str:
         """Return the path to the model."""
         return subpath(models_base_path(), f"{self.model_name}.tar.gz")
@@ -89,14 +98,8 @@ def terminate_training(training: TrainingSession) -> None:
 
 
 def update_training_status(training: TrainingSession) -> None:
-    if not training.is_status_indicating_alive():
-        # skip if the training is not running
-        return
-    if training.process.poll() is None:
-        # process is still running
-        return
-
-    complete_training(training)
+    if training.has_just_finished():
+        complete_training(training)
 
 
 def complete_training(training: TrainingSession) -> None:

rasa/model_manager/utils.py

@@ -5,15 +5,11 @@ from typing import Optional
 import structlog
 
 from rasa.model_manager import config
-from rasa.shared.exceptions import RasaException
+from rasa.utils.io import subpath
 
 structlogger = structlog.get_logger()
 
 
-class InvalidPathException(RasaException):
-    """Raised if a path is invalid - e.g. path traversal is detected."""
-
-
 def write_encoded_data_to_file(encoded_data: bytes, file: str) -> None:
     """Write base64 encoded data to a file."""
     # create the directory if it does not exist of the parent directory
@@ -53,30 +49,6 @@ def logs_path(action_id: str) -> str:
     return subpath(logs_base_path(), f"{action_id}.txt")
 
 
-def subpath(parent: str, child: str) -> str:
-    """Return the path to the child directory of the parent directory.
-
-    Ensures, that child doesn't navigate to parent directories. Prevents
-    path traversal. Raises an InvalidPathException if the path is invalid.
-
-    Based on Snyk's directory traversal mitigation:
-    https://learn.snyk.io/lesson/directory-traversal/
-    """
-    safe_path = os.path.abspath(os.path.join(parent, child))
-    parent = os.path.abspath(parent)
-
-    common_base = os.path.commonpath([parent, safe_path])
-    if common_base != parent:
-        raise InvalidPathException(f"Invalid path: {safe_path}")
-
-    if os.path.basename(safe_path) != child:
-        raise InvalidPathException(
-            f"Invalid path - path traversal detected: {safe_path}"
-        )
-
-    return safe_path
-
-
 def get_logs_content(action_id: str) -> Optional[str]:
     """Return the content of the log file for a given action id."""
     try:

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/nlu/extractors/extractor.py

@@ -2,8 +2,7 @@ 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
+@hookspec  # type: ignore[misc]
 def refine_cli(
     subparsers: SubParsersAction,
     parent_parsers: List[argparse.ArgumentParser],
@@ -45,22 +45,22 @@ def refine_cli(
     """Customizable hook for adding CLI commands."""
 
 
-@hookspec
+@hookspec  # type: ignore[misc]
 def configure_commandline(cmdline_arguments: argparse.Namespace) -> Optional[Text]:
     """Hook specification for configuring plugin CLI."""
 
 
-@hookspec
+@hookspec  # type: ignore[misc]
 def init_telemetry(endpoints_file: Optional[Text]) -> None:
     """Hook specification for initialising plugin telemetry."""
 
 
-@hookspec
+@hookspec  # type: ignore[misc]
 def init_managers(endpoints_file: Optional[Text]) -> None:
     """Hook specification for initialising managers."""
 
 
-@hookspec(firstresult=True)
+@hookspec(firstresult=True)  # type: ignore[misc]
 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
+@hookspec  # type: ignore[misc]
 def after_server_stop() -> None:
     """Hook specification for stopping the server.
 
@@ -78,11 +78,11 @@ def after_server_stop() -> None:
     """
 
 
-@hookspec
+@hookspec  # type: ignore[misc]
 def after_new_user_message(tracker: "DialogueStateTracker") -> None:
     """Hook specification for after a new user message is received."""
 
 
-@hookspec
+@hookspec  # type: ignore[misc]
 def after_action_executed(tracker: "DialogueStateTracker") -> None:
     """Hook specification for after an action is executed."""

rasa/privacy/privacy_manager.py

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

rasa/server.py

@@ -44,7 +44,6 @@ 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,
@@ -244,7 +243,7 @@ def requires_auth(
         @wraps(f)
         async def decorated(
             request: Request, *args: Any, **kwargs: Any
-        ) -> Union[response.HTTPResponse, Coroutine[Any, Any, response.HTTPResponse]]:
+        ) -> response.HTTPResponse:
             provided = request.args.get("token", None)
 
             # noinspection PyProtectedMember
@@ -677,9 +676,7 @@ def inject_temp_dir(f: Callable[..., Coroutine]) -> Callable:
     """
 
     @wraps(f)
-    async def decorated_function(
-        *args: Any, **kwargs: Any
-    ) -> Union[HTTPResponse, Coroutine[Any, Any, HTTPResponse]]:
+    async def decorated_function(*args: Any, **kwargs: 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)
@@ -696,7 +693,6 @@ 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."""
@@ -732,7 +728,6 @@ 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
@@ -1468,13 +1463,6 @@ 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/constants.py

@@ -345,8 +345,6 @@ 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"
@@ -361,6 +359,3 @@ 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,7 +30,6 @@ 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,16 +52,10 @@ ACTION_TRIGGER_CHITCHAT = "action_trigger_chitchat"
 ACTION_RESET_ROUTING = "action_reset_routing"
 ACTION_HANGUP = "action_hangup"
 ACTION_REPEAT_BOT_MESSAGES = "action_repeat_bot_messages"
-ACTION_CONTINUE_INTERRUPTED_FLOW = "action_continue_interrupted_flow"
-ACTION_SET_INTERRUPTED_FLOWS = "action_set_interrupted_flows"
-ACTION_CANCEL_INTERRUPTED_FLOW = "action_cancel_interrupted_flow"
-ACTION_ASK_INTERRUPTED_FLOW_TO_CONTINUE = "action_ask_interrupted_flow_to_continue"
 
 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,
@@ -77,7 +70,6 @@ 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,
@@ -90,10 +82,6 @@ DEFAULT_ACTION_NAMES = [
     ACTION_RESET_ROUTING,
     ACTION_HANGUP,
     ACTION_REPEAT_BOT_MESSAGES,
-    ACTION_CONTINUE_INTERRUPTED_FLOW,
-    ACTION_SET_INTERRUPTED_FLOWS,
-    ACTION_CANCEL_INTERRUPTED_FLOW,
-    ACTION_ASK_INTERRUPTED_FLOW_TO_CONTINUE,
 ]
 
 ACTION_SHOULD_SEND_DOMAIN = "send_domain"
@@ -148,6 +136,7 @@ DEFAULT_SLOT_NAMES = {
     FLOW_HASHES_SLOT,
 }
 
+
 SLOT_MAPPINGS = "mappings"
 MAPPING_CONDITIONS = "conditions"
 KEY_MAPPING_TYPE = "type"

rasa/shared/core/domain.py

@@ -98,6 +98,8 @@ 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"
@@ -146,6 +148,8 @@ 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()
@@ -318,7 +322,7 @@ class Domain:
         actions = cls._collect_action_names(domain_actions)
 
         additional_arguments = {
-            **data.get("config", {}),
+            **data.get(DOMAIN_CONFIG_KEY, {}),
             "actions_which_explicitly_need_domain": (
                 cls._collect_actions_which_explicitly_need_domain(domain_actions)
             ),
@@ -468,9 +472,9 @@ class Domain:
             return domain_dict
 
         if override:
-            config = domain_dict.get("config", {})
+            config = domain_dict.get(DOMAIN_CONFIG_KEY, {})
             for key, val in config.items():
-                combined["config"][key] = val
+                combined[DOMAIN_CONFIG_KEY][key] = val
 
         if (
             override
@@ -510,8 +514,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.
@@ -545,7 +549,7 @@ class Domain:
     def difference(self, other: Domain) -> Domain:
         """Returns a new Domain containing items in `self` that are NOT in `other`.
 
-        Simple using equality checks for dict/list items.
+        Uses simple equality checks for dict/list items.
 
         Args:
             other: The domain to compare with.
@@ -598,9 +602,16 @@ class Domain:
     ) -> Dict:
         # add the config, session_config and training data version defaults
         # if not included in the original domain dict
-        if "config" not in data and not store_entities_as_slots:
+        if (
+            DOMAIN_CONFIG_KEY not in data
+            and store_entities_as_slots != DEFAULT_STORE_ENTITIES_AS_SLOTS
+        ):
             data.update(
-                {"config": {"store_entities_as_slots": store_entities_as_slots}}
+                {
+                    DOMAIN_CONFIG_KEY: {
+                        STORE_ENTITIES_AS_SLOTS_KEY: store_entities_as_slots
+                    }
+                }
             )
 
         if SESSION_CONFIG_KEY not in data:
@@ -937,7 +948,7 @@ class Domain:
         forms: Union[Dict[Text, Any], List[Text]],
         data: Dict,
         action_texts: Optional[List[Text]] = None,
-        store_entities_as_slots: bool = True,
+        store_entities_as_slots: bool = DEFAULT_STORE_ENTITIES_AS_SLOTS,
         session_config: SessionConfig = SessionConfig.default(),
         **kwargs: Any,
     ) -> None:
@@ -1711,9 +1722,45 @@ class Domain:
         else:
             return True
 
-    def as_dict(self) -> Dict[Text, Any]:
+    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]:
         """Return serialized `Domain`."""
-        return self._data
+        if should_clean_json:
+            return self._cleaned_json_data()
+        else:
+            return self._data
 
     @staticmethod
     def get_responses_with_multilines(