rasa-pro 3.13.0rc1__py3-none-any.whl → 3.13.0rc2__py3-none-any.whl

rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py

@@ -16,6 +16,7 @@ from rasa.shared.constants import (
     PROMPT_CONFIG_KEY,
     PROMPT_TEMPLATE_CONFIG_KEY,
 )
+from rasa.shared.utils.io import raise_deprecation_warning
 from rasa.shared.utils.llm import (
     check_prompt_config_keys_and_warn_if_deprecated,
     get_prompt_template,
@@ -47,6 +48,14 @@ class SingleStepLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         prompt_template: Optional[Text] = None,
         **kwargs: Any,
     ) -> None:
+        raise_deprecation_warning(
+            message=(
+                "Support for `SingleStepLLMCommandGenerator` will be removed in Rasa "
+                "`4.0.0`. Please modify your assistant's configuration to use the "
+                "`CompactLLMCommandGenerator` or `SearchReadyLLMCommandGenerator` "
+                "instead."
+            )
+        )
         super().__init__(
             config,
             model_storage,

rasa/dialogue_understanding/processor/command_processor.py

@@ -639,9 +639,9 @@ def clean_up_slot_command(
             resulting_commands.append(command)
             return resulting_commands
 
-        if (slot := tracker.slots.get(command.name)) is not None and slot.value == str(
-            command.value
-        ):
+        if (slot := tracker.slots.get(command.name)) is not None and str(
+            slot.value
+        ) == str(command.value):
             # the slot is already set, we don't need to set it again
             structlogger.debug(
                 "command_processor.clean_up_slot_command.skip_command_slot_already_set",

rasa/e2e_test/constants.py

@@ -40,7 +40,7 @@ DEFAULT_GROUNDEDNESS_PROMPT_TEMPLATE_FILE_NAME = "groundedness_prompt_template.j
 DEFAULT_ANSWER_RELEVANCE_PROMPT_TEMPLATE_FILE_NAME = (
     "answer_relevance_prompt_template.jinja2"
 )
-DEFAULT_E2E_TESTING_MODEL = "gpt-4o-mini"
+DEFAULT_E2E_TESTING_MODEL = "gpt-4.1-mini-2025-04-14"
 KEY_SCORE = "score"
 KEY_JUSTIFICATION = "justification"
 KEY_EXTRA_PARAMETERS = "extra_parameters"

rasa/llm_fine_tuning/paraphrasing/conversation_rephraser.py

@@ -35,7 +35,7 @@ DEFAULT_REPHRASING_PROMPT_TEMPLATE = importlib.resources.read_text(
 
 DEFAULT_LLM_CONFIG = {
     PROVIDER_CONFIG_KEY: OPENAI_PROVIDER,
-    MODEL_CONFIG_KEY: "gpt-4o-mini",
+    MODEL_CONFIG_KEY: "gpt-4.1-mini-2025-04-14",
     TIMEOUT_CONFIG_KEY: 7,
     TEMPERATURE_CONFIG_KEY: 0.0,
     MAX_COMPLETION_TOKENS_CONFIG_KEY: 4096,

rasa/model_manager/runner_service.py

@@ -2,7 +2,8 @@ import os
 import shutil
 import subprocess
 from enum import Enum
-from typing import Dict, Optional
+from pathlib import Path
+from typing import Dict, Optional, Union
 
 import aiohttp
 import structlog
@@ -18,6 +19,7 @@ from rasa.model_manager.utils import (
     write_encoded_data_to_file,
 )
 from rasa.model_manager.warm_rasa_process import start_rasa_process
+from rasa.studio.prompts import handle_prompts
 
 structlogger = structlog.get_logger()
 
@@ -121,11 +123,25 @@ def get_open_port() -> int:
 
 
 def write_encoded_config_data_to_files(
-    encoded_configs: Dict[str, bytes], base_path: str
+    encoded_configs: Dict[str, Union[bytes, Dict[str, str]]], base_path: str
 ) -> None:
     """Write the encoded config data to files."""
-    for key, value in encoded_configs.items():
-        write_encoded_data_to_file(value, subpath(base_path, f"{key}.yml"))
+    endpoints_encoded = encoded_configs.get("endpoints")
+    if endpoints_encoded:
+        write_encoded_data_to_file(
+            endpoints_encoded, subpath(base_path, "endpoints.yml")
+        )
+    config_encoded = encoded_configs.get("config")
+    if config_encoded:
+        write_encoded_data_to_file(config_encoded, subpath(base_path, "config.yml"))
+    credentials_encoded = encoded_configs.get("credentials")
+    if credentials_encoded:
+        write_encoded_data_to_file(
+            credentials_encoded, subpath(base_path, "credentials.yml")
+        )
+
+    if prompts := encoded_configs.get("prompts"):
+        handle_prompts(prompts, Path(base_path))
 
 
 def prepare_bot_directory(

rasa/model_manager/trainer_service.py

@@ -2,6 +2,7 @@ import os
 import shutil
 import subprocess
 from enum import Enum
+from pathlib import Path
 from typing import Any, Dict, Optional
 
 import structlog
@@ -20,6 +21,7 @@ from rasa.model_manager.warm_rasa_process import (
     start_rasa_process,
 )
 from rasa.model_training import generate_random_model_name
+from rasa.studio.prompts import handle_prompts
 
 structlogger = structlog.get_logger()
 
@@ -208,6 +210,7 @@ def write_training_data_to_files(
         "stories": "base64 encoded stories.yml",
         "rules": "base64 encoded rules.yml",
         "nlu": "base64 encoded nlu.yml"
+        "prompts": "dictionary with the prompts",
     }
     ```
     """
@@ -230,6 +233,9 @@ def write_training_data_to_files(
             subpath(training_base_path + "/" + parent_path, file_name),
         )
 
+    if prompts := encoded_training_data.get("prompts"):
+        handle_prompts(prompts, Path(training_base_path))
+
 
 def prepare_training_directory(
     training_base_path: str, assistant_id: str, encoded_training_data: Dict[str, Any]

rasa/privacy/privacy_manager.py

@@ -12,7 +12,7 @@ import structlog
 from apscheduler.schedulers.background import BackgroundScheduler
 
 import rasa.shared.core.trackers
-from rasa.core.tracker_stores.tracker_store import TrackerStore
+from rasa.core.tracker_stores.tracker_store import FailSafeTrackerStore, TrackerStore
 from rasa.privacy.constants import (
     TEXT_KEY,
     USER_CHAT_INACTIVITY_IN_MINUTES_ENV_VAR_NAME,
@@ -63,6 +63,7 @@ class BackgroundPrivacyManager:
         self,
         endpoints: Optional["AvailableEndpoints"],
         event_loop: Optional["AbstractEventLoop"] = None,
+        in_memory_tracker_store: Optional[TrackerStore] = None,
     ):
         self.config = (
             PrivacyConfig.from_dict(endpoints.privacy)
@@ -76,15 +77,28 @@ class BackgroundPrivacyManager:
             os.getenv(USER_CHAT_INACTIVITY_IN_MINUTES_ENV_VAR_NAME, 30)
         )
 
-        # we recreate the tracker store here to ensure
-        # that this instance has no event brokers
-        # that could publish events during the tracker store
-        # background jobs
-        self.tracker_store = (
-            TrackerStore.create(endpoints.tracker_store)
-            if endpoints
-            else TrackerStore.create(None)
-        )
+        if in_memory_tracker_store is not None:
+            # if an in-memory tracker store is provided,
+            # we need to keep the reference to it
+            # so that the background jobs can access it.
+            # We also set the event broker to None
+            # to prevent it from publishing events
+            # during the tracker store background jobs
+            in_memory_tracker_store.event_broker = None
+            tracker_store = in_memory_tracker_store
+        else:
+            # we recreate the tracker store here to ensure
+            # that this instance has no event brokers
+            # that could publish events during the tracker store
+            # background jobs
+            tracker_store = (
+                TrackerStore.create(endpoints.tracker_store)
+                if endpoints
+                else TrackerStore.create(None)
+            )
+
+        self.tracker_store = FailSafeTrackerStore(tracker_store)
+
         self.event_brokers: List["EventBroker"] = []
         self.event_loop = event_loop
 
@@ -124,9 +138,10 @@ class BackgroundPrivacyManager:
         cls,
         endpoints: Optional["AvailableEndpoints"],
         event_loop: Optional["AbstractEventLoop"] = None,
+        in_memory_tracker_store: Optional[TrackerStore] = None,
     ) -> BackgroundPrivacyManager:
         """Create an instance of BackgroundPrivacyManager."""
-        instance = cls(endpoints, event_loop)
+        instance = cls(endpoints, event_loop, in_memory_tracker_store)
         return await instance.initialize(endpoints)
 
     def stop(self) -> None:

rasa/shared/constants.py

@@ -104,6 +104,8 @@ UTTER_FREE_CHITCHAT_RESPONSE = "utter_free_chitchat_response"
 ASSISTANT_ID_KEY = "assistant_id"
 ASSISTANT_ID_DEFAULT_VALUE = "placeholder_default"
 
+ENDPOINTS_NLG_KEY = "nlg"
+
 CONFIG_MANDATORY_COMMON_KEYS = [ASSISTANT_ID_KEY]
 CONFIG_NAME_KEY = "name"
 CONFIG_POLICIES_KEY = "policies"

rasa/shared/utils/llm.py

@@ -6,6 +6,7 @@ import logging
 from copy import deepcopy
 from datetime import datetime
 from functools import wraps
+from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -24,6 +25,9 @@ from typing import (
 import structlog
 from pydantic import BaseModel, Field
 
+import rasa.cli.telemetry
+import rasa.cli.utils
+import rasa.shared.utils.cli
 import rasa.shared.utils.io
 from rasa.core.available_endpoints import AvailableEndpoints
 from rasa.shared.constants import (
@@ -31,6 +35,7 @@ from rasa.shared.constants import (
     CONFIG_PIPELINE_KEY,
     CONFIG_POLICIES_KEY,
     DEFAULT_PROMPT_PACKAGE_NAME,
+    ENDPOINTS_NLG_KEY,
     LLM_CONFIG_KEY,
     MODEL_CONFIG_KEY,
     MODEL_GROUP_CONFIG_KEY,
@@ -578,7 +583,7 @@ def embedder_factory(
     ```
     {
        "provider": "openai",
-       "model": "text-embedding-3-small",
+       "model": "text-embedding-3-large",
        "timeout": 10,
        "num_retries": 3,
     }
@@ -591,7 +596,7 @@ def embedder_factory(
         "models": [
             {
                 "provider": "openai",
-                "model": "test-embedding-3-small",
+                "model": "test-embedding-3-large",
                 "api_key": "test"
             },
         ],
@@ -1072,3 +1077,82 @@ def get_system_default_prompts(
         enterprise_search=_get_enterprise_search_prompt(config),
         contextual_response_rephraser=DEFAULT_RESPONSE_VARIATION_PROMPT_TEMPLATE,
     )
+
+
+def collect_custom_prompts(
+    config: Dict[Text, Any],
+    endpoints: Dict[Text, Any],
+    project_root: Optional[Path] = None,
+) -> Dict[Text, Text]:
+    """Collects custom prompts from the project configuration and endpoints.
+
+    Args:
+        config: The configuration dictionary of the project.
+        endpoints: The endpoints configuration dictionary.
+        project_root: The root directory of the project.
+
+    Returns:
+        A dictionary containing custom prompts.
+        The keys are:
+            - 'contextual_response_rephraser'
+            - 'command_generator'
+            - 'enterprise_search'
+    """
+    from rasa.core.policies.enterprise_search_policy import EnterpriseSearchPolicy
+    from rasa.dialogue_understanding.generator.llm_based_command_generator import (
+        LLMBasedCommandGenerator,
+    )
+    from rasa.studio.prompts import (
+        COMMAND_GENERATOR_NAME,
+        CONTEXTUAL_RESPONSE_REPHRASER_NAME,
+        ENTERPRISE_SEARCH_NAME,
+    )
+
+    prompts: Dict[Text, Text] = {}
+    project_root = project_root or Path(".").resolve()
+
+    def _read_prompt(root: Path, path_in_yaml: Text) -> Optional[Text]:
+        if not path_in_yaml:
+            return None
+
+        prompt_path = (
+            (root / path_in_yaml).resolve()
+            if not Path(path_in_yaml).is_absolute()
+            else Path(path_in_yaml)
+        )
+        if prompt_path.exists():
+            return prompt_path.read_text(encoding="utf-8")
+
+        structlogger.warning(
+            "utils.llm.collect_custom_prompts.prompt_not_found",
+            event_info=(f"Prompt file '{prompt_path}' not found. "),
+            prompt_path=prompt_path,
+            project_root=root,
+        )
+        return None
+
+    # contextual_response_rephraser
+    nlg_conf = endpoints.get(ENDPOINTS_NLG_KEY) or {}
+    if prompt_text := _read_prompt(project_root, nlg_conf.get(PROMPT_CONFIG_KEY)):
+        prompts[CONTEXTUAL_RESPONSE_REPHRASER_NAME] = prompt_text
+
+    # command_generator
+    command_generator_classes = {
+        cls.__name__ for cls in all_subclasses(LLMBasedCommandGenerator)
+    }
+    for component in config.get(CONFIG_PIPELINE_KEY, []):
+        if component.get(CONFIG_NAME_KEY) in command_generator_classes:
+            if prompt_text := _read_prompt(
+                project_root, component.get(PROMPT_TEMPLATE_CONFIG_KEY)
+            ):
+                prompts[COMMAND_GENERATOR_NAME] = prompt_text
+                break
+
+    # enterprise_search
+    for policy in config.get(CONFIG_POLICIES_KEY, []):
+        if policy.get(CONFIG_NAME_KEY) == EnterpriseSearchPolicy.__name__:
+            if prompt_text := _read_prompt(project_root, policy.get(PROMPT_CONFIG_KEY)):
+                prompts[ENTERPRISE_SEARCH_NAME] = prompt_text
+            break
+
+    return prompts

rasa/studio/data_handler.py

@@ -1,5 +1,4 @@
 import base64
-import json
 import logging
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
@@ -46,15 +45,33 @@ class StudioDataHandler:
         intent_names: Optional[List[str]] = None,
         entity_names: Optional[List[str]] = None,
     ) -> dict:
+        from rasa.studio.prompts import (
+            COMMAND_GENERATOR_NAME,
+            CONTEXTUAL_RESPONSE_REPHRASER_NAME,
+            ENTERPRISE_SEARCH_NAME,
+        )
+
         request = {
-            "query": (
-                "query ExportAsEncodedYaml($input: ExportAsEncodedYamlInput!) "
-                "{ exportAsEncodedYaml(input: $input) "
-                "{ ... on ExportModernAsEncodedYamlOutput "
-                "{ nlu flows domain endpoints config prompts } "
-                "... on ExportClassicAsEncodedYamlOutput "
-                "{ nlu domain }}}"
-            ),
+            "query": "query ExportAsEncodedYaml($input: ExportAsEncodedYamlInput!) {\n"
+            "  exportAsEncodedYaml(input: $input) {\n"
+            "    ... on ExportModernAsEncodedYamlOutput {\n"
+            "      nlu\n"
+            "      flows\n"
+            "      domain\n"
+            "      endpoints\n"
+            "      config\n"
+            "      prompts {\n"
+            f"        {COMMAND_GENERATOR_NAME}\n"
+            f"        {CONTEXTUAL_RESPONSE_REPHRASER_NAME}\n"
+            f"        {ENTERPRISE_SEARCH_NAME}\n"
+            "      }\n"
+            "    }\n"
+            "    ... on ExportClassicAsEncodedYamlOutput {\n"
+            "      nlu\n"
+            "      domain\n"
+            "    }\n"
+            "  }\n"
+            "}\n",
             "variables": {"input": {"assistantName": self.assistant_name}},
         }
         if intent_names or entity_names:
@@ -98,7 +115,6 @@ class StudioDataHandler:
             },
             verify=verify,
         )
-
         if res.status_code != 200:
             raise RasaException(
                 f"Download from Studio with URL: "
@@ -203,9 +219,7 @@ class StudioDataHandler:
         self.flows = self._decode_response(return_data.get("flows"))
         self.config = self._decode_response(return_data.get("config"))
         self.endpoints = self._decode_response(return_data.get("endpoints"))
-
-        prompts_string = self._decode_response(return_data.get("prompts"))
-        self.prompts = json.loads(prompts_string) if prompts_string else None
+        self.prompts = return_data.get("prompts")
 
         if not self.has_nlu() and not self.has_flows():
             raise RasaException("No nlu or flows data in Studio response.")

rasa/studio/download.py

@@ -25,6 +25,7 @@ from rasa.studio.constants import DOMAIN_FILENAME
 from rasa.studio.data_handler import StudioDataHandler
 from rasa.studio.prompts import handle_prompts
 from rasa.studio.pull.data import _dump_flows_as_separate_files
+from rasa.studio.utils import validate_argument_paths
 
 structlogger = structlog.get_logger()
 
@@ -35,6 +36,7 @@ def handle_download(args: argparse.Namespace) -> None:
     Args:
         args: The command line arguments.
     """
+    validate_argument_paths(args)
     assistant_name = args.assistant_name
     target_root = _prepare_target_directory(assistant_name)
 
@@ -47,7 +49,9 @@ def handle_download(args: argparse.Namespace) -> None:
     _handle_endpoints(handler, target_root)
     _handle_domain(handler, target_root)
     _handle_data(handler, target_root)
-    handle_prompts(handler, target_root)
+
+    if prompts := handler.get_prompts():
+        handle_prompts(prompts, target_root)
 
     structlogger.info(
         "studio.download.success",

rasa/studio/link.py

@@ -179,8 +179,19 @@ def handle_link(args: argparse.Namespace) -> None:
     link_file = _link_file(project_root)
 
     if link_file.exists():
+        linked_assistant_name = read_assistant_name(project_root)
+        if linked_assistant_name == assistant_name:
+            rasa.shared.utils.cli.print_info(
+                f"Project is already linked to assistant '{assistant_name}'."
+            )
+            sys.exit(0)
+
         overwrite = questionary.confirm(
-            f"This project is already linked " f"(link file '{link_file}').\nOverwrite?"
+            f"Project is currently linked to the following Rasa Studio assistant:\n\n"
+            f"  Assistant name: {linked_assistant_name}\n"
+            f"  Studio URL: {studio_cfg.studio_url}\n"
+            f"  Keycloak Auth URL: {studio_cfg.authentication_server_url}\n\n"
+            f"Do you want to overwrite it with the new assistant '{assistant_name}'?"
         ).ask()
         if not overwrite:
             rasa.shared.utils.cli.print_info(

rasa/studio/prompts.py

@@ -20,7 +20,6 @@ from rasa.shared.constants import (
 from rasa.shared.utils.common import all_subclasses
 from rasa.shared.utils.llm import get_system_default_prompts
 from rasa.shared.utils.yaml import read_yaml, write_yaml
-from rasa.studio.data_handler import StudioDataHandler
 
 structlogger = structlog.get_logger()
 
@@ -29,14 +28,13 @@ COMMAND_GENERATOR_NAME = "command_generator"
 ENTERPRISE_SEARCH_NAME = "enterprise_search"
 
 
-def handle_prompts(handler: StudioDataHandler, root: Path) -> None:
+def handle_prompts(prompts: Dict[Text, Text], root: Path) -> None:
     """Handle prompts for the assistant.
 
     Args:
-        handler: The data handler to retrieve prompts from.
+        prompts: A dict containing prompt names as keys and their content as values.
         root: The root directory where the prompts should be saved.
     """
-    prompts = handler.get_prompts()
     if not prompts:
         return
 
@@ -85,7 +83,7 @@ def _handle_contextual_response_rephraser(
         return
 
     prompt_path = _save_prompt_file(
-        root, f"{CONTEXTUAL_RESPONSE_REPHRASER_NAME}.jinja", prompt_content
+        root, f"{CONTEXTUAL_RESPONSE_REPHRASER_NAME}.jinja2", prompt_content
     )
 
     endpoints["nlg"] = endpoints.get("nlg") or {}
@@ -113,7 +111,7 @@ def _handle_command_generator(
         return
 
     prompt_path = _save_prompt_file(
-        root, f"{COMMAND_GENERATOR_NAME}.jinja", prompt_content
+        root, f"{COMMAND_GENERATOR_NAME}.jinja2", prompt_content
     )
 
     command_generator_names: List[str] = [
@@ -149,7 +147,7 @@ def _handle_enterprise_search(
         return
 
     prompt_path = _save_prompt_file(
-        root, f"{ENTERPRISE_SEARCH_NAME}.jinja", prompt_content
+        root, f"{ENTERPRISE_SEARCH_NAME}.jinja2", prompt_content
     )
 
     _add_prompt_to_config(

rasa/studio/pull/pull.py

@@ -22,6 +22,7 @@ from rasa.studio.data_handler import StudioDataHandler, import_data_from_studio
 from rasa.studio.link import read_assistant_name
 from rasa.studio.pull.data import merge_flows_in_directory, merge_nlu_in_directory
 from rasa.studio.pull.domains import merge_domain
+from rasa.studio.utils import validate_argument_paths
 from rasa.utils.mapper import RasaPrimitiveStorageMapper
 
 structlogger = structlog.get_logger(__name__)
@@ -33,6 +34,7 @@ def handle_pull(args: argparse.Namespace) -> None:
     Args:
         args: The command line arguments.
     """
+    validate_argument_paths(args)
     handler = _create_studio_handler()
     handler.request_all_data()
 
@@ -55,6 +57,7 @@ def handle_pull_config(args: argparse.Namespace) -> None:
     Args:
         args: The command line arguments.
     """
+    validate_argument_paths(args)
     handler = _create_studio_handler()
     handler.request_all_data()
 
@@ -73,6 +76,7 @@ def handle_pull_endpoints(args: argparse.Namespace) -> None:
     Args:
         args: The command line arguments.
     """
+    validate_argument_paths(args)
     handler = _create_studio_handler()
     handler.request_all_data()
 
@@ -149,10 +153,10 @@ def _prepare_data_and_domain_paths(args: argparse.Namespace) -> Tuple[Path, Path
         domain_path = Path(domain_path)
 
     data_path = rasa.cli.utils.get_validated_path(
-        args.data[0], "data", DEFAULT_DATA_PATH, none_is_valid=True
+        args.data, "data", DEFAULT_DATA_PATH, none_is_valid=True
     )
 
-    data_path = Path(data_path or args.data[0])
+    data_path = Path(data_path or args.data)
     if not (data_path.is_file() or data_path.is_dir()):
         data_path.mkdir(parents=True, exist_ok=True)
 

rasa/studio/push.py

@@ -19,6 +19,7 @@ from rasa.studio.upload import (
     make_request,
     run_validation,
 )
+from rasa.studio.utils import validate_argument_paths
 
 structlogger = structlog.get_logger(__name__)
 
@@ -62,6 +63,7 @@ def handle_push(args: argparse.Namespace) -> None:
     Args:
         args: The command line arguments.
     """
+    validate_argument_paths(args)
     studio_cfg = get_studio_config()
 
     run_validation(args)