rasa-pro 3.14.0rc3__tar.gz → 3.14.0rc4__tar.gz

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.14.0rc3
+Version: 3.14.0rc4
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
 Author: Rasa Technologies GmbH
@@ -29,19 +29,19 @@ Requires-Dist: CacheControl (>=0.14.2,<0.15.0)
 Requires-Dist: PyJWT[crypto] (>=2.8.0,<3.0.0)
 Requires-Dist: SQLAlchemy (>=2.0.42,<2.1.0)
 Requires-Dist: a2a-sdk (>=0.3.4,<0.4.0)
-Requires-Dist: absl-py (>=2.0,<2.1)
+Requires-Dist: absl-py (>=2.3.1,<2.4)
 Requires-Dist: aio-pika (>=8.2.3,<9.4.4)
 Requires-Dist: aiogram (>=3.22.0,<3.23.0) ; extra == "full" or extra == "channels"
 Requires-Dist: aiohttp (>=3.10,<3.11)
 Requires-Dist: aioshutil (>=1.5,<1.6)
-Requires-Dist: apscheduler (>=3.10,<3.11)
+Requires-Dist: apscheduler (>=3.11,<3.12)
 Requires-Dist: attrs (>=23.1,<25.0)
 Requires-Dist: audioop-lts (>=0.2.2,<0.3.0) ; python_version >= "3.13"
 Requires-Dist: aws-msk-iam-sasl-signer-python (>=1.0.2,<1.1.0)
 Requires-Dist: azure-identity (>=1.24.0,<1.25.0)
 Requires-Dist: azure-storage-blob (>=12.26.0,<12.27.0)
 Requires-Dist: boto3 (>=1.40.21,<1.41.0)
-Requires-Dist: certifi (>=2024.07.04)
+Requires-Dist: certifi (>=2025.10.5,<2025.11.0)
 Requires-Dist: colorama (>=0.4.6,<0.5.0) ; sys_platform == "win32"
 Requires-Dist: colorclass (>=2.2,<2.3)
 Requires-Dist: coloredlogs (>=15,<16)
@@ -68,6 +68,7 @@ Requires-Dist: jinja2 (>=3.1.6,<3.2.0)
 Requires-Dist: jsonpatch (>=1.33,<2.0)
 Requires-Dist: jsonpickle (>=3.3.0,<3.4)
 Requires-Dist: jsonschema (>=4.22)
+Requires-Dist: keras (>=3.11.0)
 Requires-Dist: langchain (>=0.3.27,<0.4.0)
 Requires-Dist: langchain-community (>=0.3.29,<0.4.0)
 Requires-Dist: langcodes (>=3.5.0,<4.0.0)
@@ -105,13 +106,13 @@ Requires-Dist: python-socketio (>=5.13,<6)
 Requires-Dist: pytz (>=2022.7.1,<2023.0)
 Requires-Dist: pyyaml (>=6.0.2,<6.1.0)
 Requires-Dist: qdrant-client (>=1.9.1,<1.10.0)
-Requires-Dist: questionary (>=1.10.0,<2.1.0)
+Requires-Dist: questionary (>=2.1.1,<2.2.0)
 Requires-Dist: randomname (>=0.2.1,<0.3.0)
 Requires-Dist: rasa-sdk (==3.14.0rc1)
 Requires-Dist: redis (>=4.6.0,<6.0)
 Requires-Dist: regex (>=2024.7.24,<2024.8.0)
 Requires-Dist: requests (>=2.32.5,<2.33.0)
-Requires-Dist: rich (>=13.4.2,<14.0.0)
+Requires-Dist: rich (>=14.1.0,<14.2.0)
 Requires-Dist: rocketchat_API (>=1.32.0,<1.33.0) ; extra == "full" or extra == "channels"
 Requires-Dist: ruamel.yaml (>=0.17.21,<0.17.22)
 Requires-Dist: safetensors (>=0.4.5,<0.5.0)

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.14.0rc3"
+version = "3.14.0rc4"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
@@ -144,8 +144,8 @@ matplotlib = "~3.9.4"
 attrs = ">=23.1,<25.0"
 jsonpickle = ">=3.3.0,<3.4"
 redis = ">=4.6.0, <6.0"
-absl-py = ">=2.0,<2.1"
-apscheduler = ">=3.10,<3.11"
+absl-py = ">=2.3.1,<2.4"
+apscheduler = ">=3.11,<3.12"
 tqdm = "^4.66.2"
 networkx = ">=3.1,<3.2"
 pykwalify = ">=1.8,<1.9"
@@ -164,7 +164,7 @@ sanic-jwt = "^1.8.0"
 sanic-routing = "^22.8.0"
 websockets = ">=10.4,<11.0"
 aiohttp = ">=3.10,<3.11"
-questionary = ">=1.10.0,<2.1.0"
+questionary = ">=2.1.1,<2.2.0"
 prompt-toolkit = "^3.0.28,<3.0.29"
 python-socketio = ">=5.13,<6"
 python-engineio = "~4.12.2" # skip 5.0.0 upgrade
@@ -196,7 +196,7 @@ jinja2 = "~3.1.6"
 openai = "~1.68.2"
 dnspython = "2.6.1"
 wheel = ">=0.40.0"
-certifi = ">=2024.07.04"
+certifi = ">=2025.10.5,<2025.11.0"
 cryptography = "~45.0.6"
 jsonpatch = "^1.33"
 importlib-resources = "^6.5.2"
@@ -206,7 +206,7 @@ opentelemetry-exporter-otlp = "~1.33.0"
 opentelemetry-api = "~1.33.0"
 python-dotenv = "^1.0.1"
 hvac = "~2.3.0"
-rich = "^13.4.2"
+rich = ">=14.1.0,<14.2.0"
 python-keycloak = "~5.8.1"
 tiktoken = "~0.9.0"  # required by litellm
 faiss-cpu = "~1.11.0"
@@ -234,6 +234,7 @@ pymongo = "~4.10.1"
 types-cachetools = "~6.2.0.20250827"
 pep440-version-utils = "~1.2.0"
 werkzeug = "^3.1.3"
+keras = ">=3.11.0"
 
 # non-optional dependencies with additional requirements
 
@@ -503,6 +504,7 @@ convention = "google"
 
 
 
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/rasa/agents/protocol/mcp/mcp_base_agent.py

@@ -71,7 +71,7 @@ structlogger = structlog.get_logger()
 
 
 class MCPBaseAgent(AgentProtocol):
-    """MCP protocol implementation"""
+    """MCP protocol implementation."""
 
     MAX_ITERATIONS = 10
 
@@ -135,6 +135,20 @@ class MCPBaseAgent(AgentProtocol):
     @classmethod
     def from_config(cls, config: AgentConfig) -> "MCPBaseAgent":
         """Initialize the MCP Open Agent with the given configuration."""
+        # Warn if configuration.timeout is set for MCP agents
+        if config.configuration and config.configuration.timeout is not None:
+            structlogger.warning(
+                "mcp_agent.configuration.timeout.not_implemented",
+                event_info="configuration.timeout is not implemented for MCP agents. "
+                "MCP agents do not establish external connections, "
+                "so agent-level timeout is not used. "
+                "To set timeout for LLM requests, "
+                "configure 'timeout' in the model_group "
+                "in endpoints.yml and reference it via configuration.llm.model_group.",
+                agent_name=config.agent.name,
+                timeout_value=config.configuration.timeout,
+            )
+
         return cls(
             name=config.agent.name,
             description=config.agent.description,

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/rasa/agents/validation.py

@@ -5,6 +5,8 @@ import urllib.parse
 from collections import Counter
 from typing import Any, Dict, List, NoReturn, Set
 
+import jinja2.exceptions
+import structlog
 from pydantic import ValidationError as PydanticValidationError
 
 from rasa.agents.exceptions import (
@@ -23,8 +25,13 @@ from rasa.core.available_agents import (
 from rasa.core.config.available_endpoints import AvailableEndpoints
 from rasa.core.config.configuration import Configuration
 from rasa.exceptions import ValidationError
+from rasa.shared.agents.auth.utils import validate_secrets_in_params
+from rasa.shared.utils.llm import get_prompt_template, validate_jinja2_template
 from rasa.shared.utils.yaml import read_config_file
 
+# Initialize logger
+structlogger = structlog.get_logger()
+
 # Centralized allowed keys configuration to eliminate duplication
 ALLOWED_KEYS = {
     "agent": {"name", "protocol", "description"},
@@ -151,6 +158,41 @@ def _validate_a2a_config(agent_config: AgentConfig) -> None:
                 f"exist: {agent_card}",
             )
 
+    # Validate right use of secrets in auth configuration
+    if agent_config.configuration.auth:
+        validate_secrets_in_params(
+            agent_config.configuration.auth, f"agent '{agent_name}'"
+        )
+
+
+def _validate_prompt_template_syntax(prompt_path: str, agent_name: str) -> None:
+    """Validate Jinja2 syntax of a prompt template file."""
+    try:
+        # Use a simple default template, as we're assuming
+        # that the default templates are valid
+        default_template = "{{ content }}"
+        template_content = get_prompt_template(
+            prompt_path,
+            default_template,
+            log_source_component=f"agent.validation.{agent_name}",
+            log_source_method="init",
+        )
+        validate_jinja2_template(template_content)
+
+    except jinja2.exceptions.TemplateSyntaxError as e:
+        raise ValidationError(
+            code="agent.validation.prompt_template_syntax_error",
+            event_info=(
+                f"Agent '{agent_name}' has invalid Jinja2 template syntax at line "
+                f"{e.lineno}: {e.message}"
+            ),
+        ) from e
+    except Exception as e:
+        raise ValidationError(
+            code="agent.validation.optional.prompt_template_error",
+            event_info=(f"Agent '{agent_name}' has error reading prompt template: {e}"),
+        ) from e
+
 
 def _validate_optional_keys(agent_config: AgentConfig) -> None:
     """Validate optional keys in agent configuration."""
@@ -160,11 +202,22 @@ def _validate_optional_keys(agent_config: AgentConfig) -> None:
     if agent_config.configuration and agent_config.configuration.prompt_template:
         prompt_path = agent_config.configuration.prompt_template
         if not os.path.exists(prompt_path):
-            raise ValidationError(
-                code="agent.validation.optional.prompt_template_not_found",
-                event_info=f"Agent '{agent_name}' has prompt template that "
-                f"does not exist: {prompt_path}",
+            # If reading the custom prompt fails,
+            # allow fallback to default prompt template
+            structlogger.warning(
+                "agent.validation.optional.prompt_template_file_not_found",
+                agent_name=agent_name,
+                prompt_path=prompt_path,
+                event_info=(
+                    f"Prompt template file not found: {prompt_path}. "
+                    f"Agent will use default template."
+                ),
             )
+            # Don't raise ValidationError, allow fallback to default template
+            return
+
+        # Validate Jinja2 syntax
+        _validate_prompt_template_syntax(prompt_path, agent_name)
 
     # Validate module if present
     if agent_config.configuration and agent_config.configuration.module:

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/rasa/builder/copilot/constants.py

@@ -14,6 +14,7 @@ COPILOT_TRAINING_ERROR_HANDLER_PROMPT_FILE = (
 COPILOT_MESSAGE_TEMPLATES_DIR = "builder.copilot.templated_messages"
 RASA_INTERNAL_MESSAGES_TEMPLATES_FILE = "copilot_internal_messages_templates.yml"
 COPILOT_HANDLER_RESPONSES_FILE = "copilot_templated_responses.yml"
+COPILOT_WELCOME_MESSAGES_FILE = "copilot_welcome_messages.yml"
 
 # OpenAI roles copilot utilizes - Use literal types to avoid type errors with OpenAI
 ROLE_USER: Literal["user"] = "user"
@@ -32,3 +33,6 @@ COPILOT_SEGMENT_WRITE_KEY_ENV_VAR = "COPILOT_SEGMENT_WRITE_KEY"
 
 # Copilot signing
 SIGNATURE_VERSION_V1 = "v1"
+
+# Welcome message key for prompt-to-bot (not a template enum)
+PROMPT_TO_BOT_KEY = "prompt_to_bot"

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/rasa/builder/copilot/copilot_templated_message_provider.py

@@ -7,6 +7,7 @@ import yaml  # type: ignore
 from rasa.builder.copilot.constants import (
     COPILOT_HANDLER_RESPONSES_FILE,
     COPILOT_MESSAGE_TEMPLATES_DIR,
+    COPILOT_WELCOME_MESSAGES_FILE,
     RASA_INTERNAL_MESSAGES_TEMPLATES_FILE,
 )
 from rasa.shared.constants import PACKAGE_NAME
@@ -56,3 +57,25 @@ def load_copilot_handler_default_responses() -> Dict[str, str]:
             error=e,
         )
         return dict()
+
+
+def load_copilot_welcome_messages() -> Dict[str, str]:
+    """Load welcome message templates from the YAML configuration file.
+
+    Returns:
+        Dictionary mapping template names to welcome message text.
+    """
+    try:
+        config = yaml.safe_load(
+            importlib.resources.read_text(
+                f"{PACKAGE_NAME}.{COPILOT_MESSAGE_TEMPLATES_DIR}",
+                COPILOT_WELCOME_MESSAGES_FILE,
+            )
+        )
+        return config.get("welcome_messages", {})
+    except Exception as e:
+        structlogger.error(
+            "copilot_templated_message_provider.failed_to_load_welcome_messages",
+            error=e,
+        )
+        return dict()

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/rasa/builder/copilot/templated_messages/copilot_templated_responses.yml

@@ -36,3 +36,6 @@ responses:
   guardrail_blocked_project_response: |
     Your Copilot access has been temporarily blocked due to repeated policy violations.
     If you believe this is an error or would like to request a review, please reach out to support@rasa.com.
+
+  training_success_response: |
+    Your changes have been saved successfully.

rasa_pro-3.14.0rc4/rasa/builder/copilot/templated_messages/copilot_welcome_messages.yml

@@ -0,0 +1,56 @@
+welcome_messages:
+  copilot_intro: |
+    👋 Welcome to Hello Rasa!
+
+    I'm your **Copilot** — here to help you explore Rasa and start customizing your agent.
+    You can ask me how your agent works, how to add new skills, or how to connect integrations.
+
+  finance: |
+    👋 Welcome to Hello Rasa!
+
+    I'm your **Copilot** — here to help you explore Rasa and start customizing your agent.
+    You can ask me how your agent works, how to add new skills, or how to connect integrations.
+
+    Your **Banking Agent template** is now live.
+
+    ### ▶️ **First step: try it out**
+    Ask your agent (in the chat preview on the right):
+    - *What's my current balance?*
+    - *Send 100 dollars to James.*
+
+  telco: |
+    👋 Welcome to Hello Rasa!
+
+    I'm your **Copilot** — here to help you explore Rasa and start customizing your agent.
+    You can ask me how your agent works, how to add new skills, or how to connect integrations.
+
+    Your **Telecom Support Agent template** is now live.
+
+    ### ▶️ **First step: try it out**
+    Ask your agent (in the chat preview on the right):
+    - *Why is my internet slow?*
+    - *How do i reboot my router?*
+
+  basic: |
+    👋 Welcome to Hello Rasa!
+
+    I'm your **Copilot** — here to help you explore Rasa and start customizing your agent.
+    You can ask me how your agent works, how to add new skills, or how to connect integrations.
+
+    Your **Starter Agent template** is now live.
+
+    ### ▶️ **First step: try it out**
+    Ask your agent (in the chat preview on the right):
+    - *What can you do?*
+    - *Can I talk to a human?*
+
+  prompt_to_bot: |
+    👋 Welcome to Hello Rasa!
+
+    I'm your **Copilot** — here to help you explore Rasa and start customizing your agent.
+    You can ask me how your agent works, how to add new skills, or how to connect integrations.
+
+    Your custom agent has been created and trained successfully.
+
+    ### ▶️ **First step: try it out**
+    Test your agent in the chat preview on the right to see how it responds to your users.

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/rasa/builder/jobs.py

@@ -4,6 +4,13 @@ import structlog
 from sanic import Sanic
 
 from rasa.builder import config
+from rasa.builder.copilot.constants import (
+    PROMPT_TO_BOT_KEY,
+)
+from rasa.builder.copilot.copilot_templated_message_provider import (
+    load_copilot_handler_default_responses,
+    load_copilot_welcome_messages,
+)
 from rasa.builder.copilot.models import (
     CopilotContext,
     FileContent,
@@ -80,11 +87,20 @@ async def run_prompt_to_bot_job(
         update_agent(agent, app)
         await push_job_status_event(job, JobStatus.train_success)
 
+        # 3. Create copilot welcome message job
+        copilot_welcome_job = job_manager.create_job()
+        app.add_task(run_copilot_welcome_message_job(app, copilot_welcome_job))
+
         structlogger.info(
             "bot_builder_service.prompt_to_bot.success",
             files_generated=list(bot_files.keys()),
+            copilot_welcome_job_id=copilot_welcome_job.id,
+        )
+        await push_job_status_event(
+            job=job,
+            status=JobStatus.done,
+            payload={"copilot_welcome_job_id": copilot_welcome_job.id},
         )
-        await push_job_status_event(job, JobStatus.done)
         job_manager.mark_done(job)
 
     except TrainingError as exc:
@@ -165,12 +181,23 @@ async def run_template_to_bot_job(
         update_agent(agent, app)
         await push_job_status_event(job, JobStatus.train_success)
 
-        # 3) Done
+        # 3) Create copilot welcome message job
+        copilot_welcome_job = job_manager.create_job()
+        app.add_task(
+            run_copilot_welcome_message_job(app, copilot_welcome_job, template_name)
+        )
+
+        # 4) Done - include welcome job ID in payload
         structlogger.info(
             "bot_builder_service.template_to_bot.success",
             files_generated=list(bot_files.keys()),
+            copilot_welcome_job_id=copilot_welcome_job.id,
+        )
+        await push_job_status_event(
+            job=job,
+            status=JobStatus.done,
+            payload={"copilot_welcome_job_id": copilot_welcome_job.id},
         )
-        await push_job_status_event(job, JobStatus.done)
         job_manager.mark_done(job)
 
     except TrainingError as exc:
@@ -256,8 +283,19 @@ async def run_replace_all_files_job(
         update_agent(agent, app)
         await push_job_status_event(job, JobStatus.train_success)
 
-        # Send final done event
-        await push_job_status_event(job, JobStatus.done)
+        # Send final done event with copilot training success response job ID
+        copilot_training_success_job = job_manager.create_job()
+        app.add_task(
+            run_copilot_training_success_job(app, copilot_training_success_job)
+        )
+
+        await push_job_status_event(
+            job=job,
+            status=JobStatus.done,
+            payload={
+                "copilot_training_success_job_id": copilot_training_success_job.id
+            },
+        )
         job_manager.mark_done(job)
 
     except ValidationError as exc:
@@ -450,3 +488,122 @@ async def run_copilot_training_error_analysis_job(
             job, JobStatus.copilot_analysis_error, message=str(exc)
         )
         job_manager.mark_done(job, error=str(exc))
+
+
+async def run_copilot_welcome_message_job(
+    app: "Sanic",
+    job: JobInfo,
+    template_name: Optional[ProjectTemplateName] = None,
+) -> None:
+    """Run the welcome message job in the background.
+
+    This job sends a welcome message to the user after successful bot creation.
+    For template-based bots, it sends a predefined message.
+    For prompt-based bots, it can be extended to stream generated messages.
+
+    Args:
+        app: The Sanic application instance.
+        job: The job information instance.
+        template_name: The template name for template-based bots, None for prompt-based.
+    """
+    try:
+        # Load welcome messages from YAML
+        welcome_messages = load_copilot_welcome_messages()
+
+        # Get the appropriate welcome message
+        if template_name:
+            welcome_message = welcome_messages.get(
+                template_name.value,
+                welcome_messages.get(PROMPT_TO_BOT_KEY),
+            )
+        else:
+            welcome_message = welcome_messages.get(PROMPT_TO_BOT_KEY)
+
+        # Send the welcome message as a single event
+        await push_job_status_event(
+            job,
+            JobStatus.copilot_welcome_message,
+            payload={
+                "content": welcome_message,
+                "response_category": "copilot",
+                "completeness": "complete",
+            },
+        )
+
+        # Mark job as done
+        await push_job_status_event(job, JobStatus.done)
+        job_manager.mark_done(job)
+
+        structlogger.info(
+            "copilot_welcome_message_job.success",
+            job_id=job.id,
+            template=template_name.value if template_name else PROMPT_TO_BOT_KEY,
+        )
+
+    except Exception as exc:
+        structlogger.exception(
+            "welcome_message_job.error",
+            job_id=job.id,
+            error=str(exc),
+        )
+        await push_job_status_event(job, JobStatus.error, message=str(exc))
+        job_manager.mark_done(job, error=str(exc))
+
+
+async def run_copilot_training_success_job(
+    app: "Sanic",
+    job: JobInfo,
+) -> None:
+    """Run the training success job in the background.
+
+    This job sends a training success message to the user after successful bot training.
+
+    Args:
+        app: The Sanic application instance.
+        job: The job information instance.
+    """
+    try:
+        # Load copilot default messages from YAML
+        internal_messages = load_copilot_handler_default_responses()
+
+        # Get the appropriate training success message
+        training_success_message = internal_messages.get("training_success_response")
+
+        # Send the training success message
+        await push_job_status_event(
+            job,
+            JobStatus.train_success_message,
+            payload={
+                "content": training_success_message,
+                "response_category": "copilot",
+                "completeness": "complete",
+            },
+        )
+
+        # Send the training success category
+        await push_job_status_event(
+            job,
+            JobStatus.train_success_message,
+            payload={
+                "response_category": "copilot_training_success",
+                "completeness": "complete",
+            },
+        )
+
+        # Mark job as done
+        await push_job_status_event(job, JobStatus.done)
+        job_manager.mark_done(job)
+
+        structlogger.info(
+            "copilot_training_success_job.success",
+            job_id=job.id,
+        )
+
+    except Exception as exc:
+        structlogger.exception(
+            "copilot_training_success_job.error",
+            job_id=job.id,
+            error=str(exc),
+        )
+        await push_job_status_event(job, JobStatus.error, message=str(exc))
+        job_manager.mark_done(job, error=str(exc))

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/rasa/builder/models.py

@@ -191,6 +191,7 @@ class JobStatus(str, Enum):
 
     training = "training"
     train_success = "train_success"
+    train_success_message = "train_success_message"
     train_error = "train_error"
 
     validating = "validating"
@@ -202,6 +203,8 @@ class JobStatus(str, Enum):
     copilot_analysis_success = "copilot_analysis_success"
     copilot_analysis_error = "copilot_analysis_error"
 
+    copilot_welcome_message = "copilot_welcome_message"
+
 
 class JobCreateResponse(BaseModel):
     job_id: str = Field(...)

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/rasa/cli/validation/bot_config.py

@@ -189,6 +189,7 @@ def validate_files(
             validator, max_history, fail_on_warnings
         )
         valid_flows = validator.verify_flows()
+        valid_prompt_templates = validator.verify_prompt_templates()
         if validator.config:
             valid_translations = validator.verify_translations(summary_mode=True)
         else:
@@ -207,6 +208,7 @@ def validate_files(
             and valid_nlu
             and valid_stories
             and valid_flows
+            and valid_prompt_templates
             and valid_translations
             and valid_CALM_slot_mappings
             and valid_sub_agents

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/rasa/core/config/available_endpoints.py

@@ -7,6 +7,7 @@ from typing import Any, Dict, List, Optional, Union
 from pydantic import BaseModel, ConfigDict, Field, model_validator
 
 from rasa.core.constants import MCP_SERVERS_KEY
+from rasa.shared.agents.auth.utils import validate_secrets_in_params
 from rasa.shared.core.constants import (
     GLOBAL_SILENCE_TIMEOUT_DEFAULT_VALUE,
     GLOBAL_SILENCE_TIMEOUT_KEY,
@@ -77,6 +78,11 @@ class MCPServerConfig(BaseModel):
         # validate that name and url are not empty
         if not self.name or not self.url:
             raise ValueError("Name and URL cannot be empty")
+        # validate secrets in additional_params
+        if self.additional_params:
+            validate_secrets_in_params(
+                self.additional_params, f"MCP server - '{self.name}'"
+            )
         return self
 
     @model_validator(mode="before")

{rasa_pro-3.14.0rc3 → rasa_pro-3.14.0rc4}/rasa/dialogue_understanding/patterns/default_flows_for_patterns.yml

@@ -227,28 +227,30 @@ flows:
       - noop: true
         next:
           - if: context.multiple_flows_interrupted
+            then: collect_interrupted_flow_to_continue
+          - else: collect_continue_interrupted_flow_confirmation
+      - id: collect_interrupted_flow_to_continue
+        collect: interrupted_flow_to_continue
+        description: "Fill this slot with the name of the flow the user wants to continue. If the user does not want to continue any of the interrupted flows, fill this slot with 'none'."
+        next:
+          - if: slots.interrupted_flow_to_continue != "none"
+            then:
+              - action: action_continue_interrupted_flow
+                next: END
+          - else:
+              - action: action_cancel_interrupted_flows
+                next: END
+      - id: collect_continue_interrupted_flow_confirmation
+        collect: continue_interrupted_flow_confirmation
+        description: "If the user wants to continue the interrupted flow, fill this slot with true. If the user does not want to continue the interrupted flow, fill this slot with false."
+        next:
+          - if: slots.continue_interrupted_flow_confirmation
             then:
-              - collect: interrupted_flow_to_continue
-                description: "Fill this slot with the name of the flow the user wants to continue. If the user does not want to continue any of the interrupted flows, fill this slot with 'none'."
-                next:
-                  - if: slots.interrupted_flow_to_continue != "none"
-                    then:
-                      - action: action_continue_interrupted_flow
-                        next: END
-                  - else:
-                      - action: action_cancel_interrupted_flows
-                        next: END
+              - action: action_continue_interrupted_flow
+                next: END
           - else:
-            - collect: continue_interrupted_flow_confirmation
-              description: "If the user wants to continue the interrupted flow, fill this slot with true. If the user does not want to continue the interrupted flow, fill this slot with false."
-              next:
-                - if: slots.continue_interrupted_flow_confirmation
-                  then:
-                    - action: action_continue_interrupted_flow
-                      next: END
-                - else:
-                    - action: action_cancel_interrupted_flows
-                      next: END
+              - action: action_cancel_interrupted_flows
+                next: END
 
   pattern_correction:
     description: Conversation repair flow for managing user input changes or error corrections