rasa-pro 3.13.0.dev10__py3-none-any.whl → 3.13.0.dev11__py3-none-any.whl

rasa/cli/studio/download.py

@@ -4,11 +4,12 @@ from typing import List
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments.default_arguments import (
     add_config_param,
+    add_data_param,
+    add_domain_param,
     add_endpoint_param,
 )
-from rasa.cli.arguments.train import add_data_param, add_domain_param
 from rasa.shared.constants import DEFAULT_CONFIG_PATH, DEFAULT_ENDPOINTS_PATH
-from rasa.studio.download.download import handle_download
+from rasa.studio.download import handle_download
 
 
 def add_subparser(
@@ -49,13 +50,6 @@ def set_studio_download_arguments(parser: argparse.ArgumentParser) -> None:
     parser.add_argument(
         "assistant_name",
         default=None,
-        nargs=1,
         type=str,
         help="Name of the assistant on Rasa Studio",
     )
-
-    parser.add_argument(
-        "--overwrite",
-        action="store_true",
-        help="Overwrite local data with data from Rasa Studio",
-    )

rasa/cli/studio/link.py

@@ -2,7 +2,7 @@ import argparse
 from typing import List, Text
 
 from rasa.cli import SubParsersAction
-from rasa.cli.studio.upload import (
+from rasa.cli.arguments.default_arguments import (
     add_config_param,
     add_data_param,
     add_domain_param,
@@ -37,7 +37,6 @@ def add_subparser(
 
     link_parser.add_argument(
         "assistant_name",
-        nargs=1,
         type=str,
         help="Name of the assistant in Rasa Studio.",
     )

rasa/cli/studio/pull.py

@@ -4,15 +4,16 @@ from typing import List, Text
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments.default_arguments import (
     add_config_param,
+    add_data_param,
+    add_domain_param,
     add_endpoint_param,
 )
-from rasa.cli.studio.upload import add_data_param, add_domain_param
 from rasa.shared.constants import (
     DEFAULT_CONFIG_PATH,
     DEFAULT_DOMAIN_PATH,
     DEFAULT_ENDPOINTS_PATH,
 )
-from rasa.studio.pull import (
+from rasa.studio.pull.pull import (
     handle_pull,
     handle_pull_config,
     handle_pull_endpoints,

rasa/cli/studio/push.py

@@ -2,7 +2,7 @@ import argparse
 from typing import List, Text
 
 from rasa.cli import SubParsersAction
-from rasa.cli.studio.upload import (
+from rasa.cli.arguments.default_arguments import (
     add_config_param,
     add_data_param,
     add_domain_param,

rasa/cli/studio/train.py

@@ -36,7 +36,6 @@ def set_studio_train_arguments(parser: argparse.ArgumentParser) -> None:
     parser.add_argument(
         "assistant_name",
         default=None,
-        nargs=1,
         type=str,
         help="Name of the assistant on Rasa Studio",
     )

rasa/core/policies/enterprise_search_policy.py

@@ -135,10 +135,7 @@ DEFAULT_ENTERPRISE_SEARCH_PROMPT_WITH_RELEVANCY_CHECK_AND_CITATION_TEMPLATE = (
     )
 )
 
-# TODO: Update this pattern once the experiments are done
-_ENTERPRISE_SEARCH_ANSWER_NOT_RELEVANT_PATTERN = re.compile(
-    r"\[NO_RELEVANT_ANSWER_FOUND\]"
-)
+_ENTERPRISE_SEARCH_ANSWER_NOT_RELEVANT_PATTERN = re.compile(r"\[NO_RAG_ANSWER\]")
 
 
 class VectorStoreConnectionError(RasaException):

rasa/core/policies/enterprise_search_prompt_with_relevancy_check_and_citation_template.jinja2

@@ -1,5 +1,9 @@
-Given the following information, please provide an answer based on the provided documents and the context of the recent conversation.
-If the answer is not known or cannot be determined from the provided documents or context, please state that you do not know to the user.
+Based on the provided documents and the recent conversation context, answer the following question.
+Before responding, ensure the answer is directly supported by the documents or context.
+Do not make assumptions or infer beyond the given information.
+Only answer if you are more than 80% confident that the response is fully supported.
+If the answer cannot be determined, respond with: [NO_RAG_ANSWER]
+
 ### Relevant Documents
 Use the following documents to answer the question:
 {% for doc in docs %}
@@ -57,7 +61,4 @@ Avoid speculating or making assumptions beyond the given information and keep yo
 If you are unable to find an answer in the given relevant documents, do not cite sources from elsewhere in the conversation context.
 {% endif %}
 
-{% if check_relevancy %}
-If answer is not relevant output: "[NO_RELEVANT_ANSWER_FOUND]"
-{% endif %}
 Your answer:

rasa/core/utils.py

@@ -318,16 +318,25 @@ def should_force_slot_filling(
         and the name of the slot if applicable.
     """
     from rasa.dialogue_understanding.processor.command_processor import (
+        find_updated_flows,
         get_current_collect_step,
     )
 
     if tracker is None:
-        structlogger.error(
-            "slot.force_slot_filling.error",
+        structlogger.debug(
+            "slot.force_slot_filling.no_found_tracker",
             event_info="Tracker is None. Cannot force slot filling.",
         )
         return False, None
 
+    updated_flows = find_updated_flows(tracker, flows)
+    if updated_flows:
+        structlogger.debug(
+            "slot.force_slot_filling.running_flows_were_updated",
+            updated_flow_ids=updated_flows,
+        )
+        return False, None
+
     stack = tracker.stack
     step = get_current_collect_step(stack, flows)
     if step is None or not step.force_slot_filling:

rasa/dialogue_understanding/commands/__init__.py

@@ -16,6 +16,9 @@ from rasa.dialogue_understanding.commands.error_command import ErrorCommand
 from rasa.dialogue_understanding.commands.free_form_answer_command import (
     FreeFormAnswerCommand,
 )
+from rasa.dialogue_understanding.commands.handle_code_change_command import (
+    HandleCodeChangeCommand,
+)
 from rasa.dialogue_understanding.commands.human_handoff_command import (
     HumanHandoffCommand,
 )
@@ -49,6 +52,7 @@ __all__ = [
     "SetSlotCommand",
     "StartFlowCommand",
     "HumanHandoffCommand",
+    "HandleCodeChangeCommand",
     "CorrectSlotsCommand",
     "CorrectedSlot",
     "ErrorCommand",

rasa/dialogue_understanding/generator/command_generator.py

@@ -8,6 +8,7 @@ from rasa.dialogue_understanding.commands import (
     Command,
     CorrectSlotsCommand,
     ErrorCommand,
+    HandleCodeChangeCommand,
     SetSlotCommand,
     StartFlowCommand,
 )
@@ -398,15 +399,24 @@ class CommandGenerator:
             The filtered commands.
         """
         from rasa.dialogue_understanding.processor.command_processor import (
+            find_updated_flows,
             get_current_collect_step,
         )
 
         if tracker is None:
-            structlogger.error(
+            structlogger.debug(
                 "command_generator.filter_commands_during_force_slot_filling.tracker_not_found",
             )
             return commands
 
+        updated_flows = find_updated_flows(tracker, available_flows)
+        if updated_flows:
+            structlogger.debug(
+                "command_generator.filter_commands_during_force_slot_filling.running_flows_were_updated",
+                updated_flow_ids=updated_flows,
+            )
+            return [HandleCodeChangeCommand()]
+
         stack = tracker.stack
         step = get_current_collect_step(stack, available_flows)
 

rasa/dialogue_understanding/processor/command_processor.py

@@ -214,18 +214,18 @@ def execute_commands(
     commands: List[Command] = get_commands_from_tracker(tracker)
     original_tracker = tracker.copy()
 
-    commands = clean_up_commands(
-        commands, tracker, all_flows, execution_context, story_graph, domain
-    )
-
     updated_flows = find_updated_flows(tracker, all_flows)
     if updated_flows:
-        # Override commands
+        # if there are updated flows, we need to handle the code change
         structlogger.debug(
             "command_processor.execute_commands.running_flows_were_updated",
             updated_flow_ids=updated_flows,
         )
         commands = [HandleCodeChangeCommand()]
+    else:
+        commands = clean_up_commands(
+            commands, tracker, all_flows, execution_context, story_graph, domain
+        )
 
     # store current flow hashes if they changed
     new_hashes = calculate_flow_fingerprints(all_flows)

rasa/shared/utils/constants.py

@@ -2,9 +2,6 @@ DEFAULT_ENCODING = "utf-8"
 
 READ_YAML_FILE_CACHE_MAXSIZE_ENV_VAR = "READ_YAML_FILE_CACHE_MAXSIZE"
 DEFAULT_READ_YAML_FILE_CACHE_MAXSIZE = 256
-RASA_PRO_BETA_PREDICATES_IN_RESPONSE_CONDITIONS_ENV_VAR_NAME = (
-    "RASA_PRO_BETA_PREDICATES_IN_RESPONSE_CONDITIONS"
-)
 
 LOG_COMPONENT_SOURCE_METHOD_INIT = "init"
 LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON = "fingerprint_addon"

rasa/shared/utils/pykwalify_extensions.py

@@ -8,11 +8,6 @@ from typing import Any, Dict, List, Text, Union
 
 from pykwalify.errors import SchemaError
 
-from rasa.shared.utils.constants import (
-    RASA_PRO_BETA_PREDICATES_IN_RESPONSE_CONDITIONS_ENV_VAR_NAME,
-)
-from rasa.utils.beta import ensure_beta_feature_is_enabled
-
 
 def require_response_keys(
     responses: List[Dict[Text, Any]], _: Dict, __: Text
@@ -31,10 +26,6 @@ def require_response_keys(
 
         conditions = response.get("condition", [])
         if isinstance(conditions, str):
-            ensure_beta_feature_is_enabled(
-                "predicates in response conditions",
-                RASA_PRO_BETA_PREDICATES_IN_RESPONSE_CONDITIONS_ENV_VAR_NAME,
-            )
             continue
 
         for condition in conditions:

rasa/studio/constants.py

@@ -14,6 +14,7 @@ RASA_STUDIO_CLI_DISABLE_VERIFY_KEY_ENV = "RASA_STUDIO_CLI_DISABLE_VERIFY_KEY"
 
 STUDIO_NLU_FILENAME = "studio_nlu.yml"
 STUDIO_DOMAIN_FILENAME = "studio_domain.yml"
+DOMAIN_FILENAME = "domain.yml"
 STUDIO_FLOWS_FILENAME = "studio_flows.yml"
 STUDIO_CONFIG_FILENAME = "studio_config.yml"
 STUDIO_ENDPOINTS_FILENAME = "studio_endpoints.yml"

rasa/studio/download.py

@@ -0,0 +1,164 @@
+import argparse
+import shutil
+from pathlib import Path
+from typing import Dict
+
+import questionary
+import structlog
+from ruamel import yaml
+from ruamel.yaml.scalarstring import LiteralScalarString
+
+import rasa.cli.utils
+import rasa.shared.utils.cli
+from rasa.shared.constants import (
+    DEFAULT_CONFIG_PATH,
+    DEFAULT_DATA_PATH,
+    DEFAULT_ENDPOINTS_PATH,
+)
+from rasa.shared.core.flows.yaml_flows_io import FlowsList
+from rasa.shared.nlu.training_data.training_data import (
+    DEFAULT_TRAINING_DATA_OUTPUT_PATH,
+)
+from rasa.shared.utils.yaml import read_yaml, write_yaml
+from rasa.studio.config import StudioConfig
+from rasa.studio.constants import DOMAIN_FILENAME
+from rasa.studio.data_handler import StudioDataHandler
+from rasa.studio.pull.data import _dump_flows_as_separate_files
+
+structlogger = structlog.get_logger()
+
+
+def handle_download(args: argparse.Namespace) -> None:
+    """Download an assistant from Studio and store it in `<assistant_name>/`.
+
+    Args:
+        args: The command line arguments.
+    """
+    assistant_name = args.assistant_name
+    target_root = _prepare_target_directory(assistant_name)
+
+    handler = StudioDataHandler(
+        studio_config=StudioConfig.read_config(), assistant_name=assistant_name
+    )
+    handler.request_all_data()
+
+    _handle_config(handler, target_root)
+    _handle_endpoints(handler, target_root)
+    _handle_domain(handler, target_root)
+    _handle_data(handler, target_root)
+    structlogger.info(
+        "studio.download.success",
+        event_info=f"Downloaded assistant '{assistant_name}' from Studio.",
+        assistant_name=assistant_name,
+    )
+    rasa.shared.utils.cli.print_success(
+        f"Downloaded assistant '{assistant_name}' from Studio."
+    )
+
+
+def _prepare_target_directory(assistant_name: str) -> Path:
+    """Create (or overwrite) the directory where everything is stored.
+
+    Args:
+        assistant_name: The name of the assistant to download.
+
+    Returns:
+        The path to the target directory where the assistant will be stored.
+    """
+    target_root = Path(assistant_name)
+
+    if target_root.exists():
+        overwrite = questionary.confirm(
+            f"Directory '{assistant_name}' already exists. Overwrite it?"
+        ).ask()
+        if not overwrite:
+            rasa.shared.utils.cli.print_error_and_exit("Download cancelled.")
+
+        shutil.rmtree(target_root)
+
+    target_root.mkdir(parents=True, exist_ok=True)
+    return target_root
+
+
+def _handle_config(handler: StudioDataHandler, root: Path) -> None:
+    """Download and persist the assistant’s config file.
+
+    Args:
+        handler: The data handler to retrieve the config from.
+        root: The root directory where the config file will be stored.
+    """
+    config_data = handler.get_config()
+    if not config_data:
+        rasa.shared.utils.cli.print_error_and_exit("No config data found.")
+
+    config_path = root / DEFAULT_CONFIG_PATH
+    config_path.write_text(config_data, encoding="utf-8")
+
+
+def _handle_endpoints(handler: StudioDataHandler, root: Path) -> None:
+    """Download and persist the assistant’s endpoints file.
+
+    Args:
+        handler: The data handler to retrieve the endpoints from.
+        root: The root directory where the endpoints file will be stored.
+    """
+    endpoints_data = handler.get_endpoints()
+    if not endpoints_data:
+        rasa.shared.utils.cli.print_error_and_exit("No endpoints data found.")
+
+    endpoints_path = root / DEFAULT_ENDPOINTS_PATH
+    endpoints_path.write_text(endpoints_data, encoding="utf-8")
+
+
+def _handle_domain(handler: StudioDataHandler, root: Path) -> None:
+    """Persist the assistant’s domain file.
+
+    Args:
+        handler: The data handler to retrieve the domain from.
+        root: The root directory where the domain file will be stored.
+    """
+    domain_yaml = handler.domain
+    data = read_yaml(domain_yaml)
+    target = root / DOMAIN_FILENAME
+    write_yaml(
+        data=data,
+        target=target,
+        should_preserve_key_order=True,
+    )
+
+
+def _handle_data(handler: StudioDataHandler, root: Path) -> None:
+    """Persist NLU data and flows.
+
+    Args:
+        handler: The data handler to retrieve the NLU data and flows from.
+        root: The root directory where the NLU data and flows will be stored.
+    """
+    data_path = root / DEFAULT_DATA_PATH
+    data_path.mkdir(parents=True, exist_ok=True)
+
+    if handler.has_nlu():
+        nlu_yaml = handler.nlu
+        nlu_data = read_yaml(nlu_yaml)
+        if nlu_data.get("nlu"):
+            pretty_write_nlu_yaml(
+                nlu_data, data_path / DEFAULT_TRAINING_DATA_OUTPUT_PATH
+            )
+
+    if handler.has_flows():
+        flows_yaml = handler.flows
+        data = read_yaml(flows_yaml)
+        flows_data = data.get("flows", {})
+        flows_list = FlowsList.from_json(flows_data)
+        _dump_flows_as_separate_files(flows_list.underlying_flows, data_path)
+
+
+def pretty_write_nlu_yaml(data: Dict, file: Path) -> None:
+    """Writes the NLU YAML in a pretty way."""
+    dumper = yaml.YAML()
+    if nlu_data := data.get("nlu"):
+        for item in nlu_data:
+            if item.get("examples"):
+                item["examples"] = LiteralScalarString(item["examples"])
+    with file.open("w", encoding="utf-8") as outfile:
+        dumper.dump(data, outfile)

rasa/studio/link.py

@@ -167,7 +167,7 @@ def handle_link(args: argparse.Namespace) -> None:
     Args:
         args: The command line arguments.
     """
-    assistant_name: Text = args.assistant_name[0]
+    assistant_name: Text = args.assistant_name
     studio_cfg = get_studio_config()
     assistant_exists = _ensure_assistant_exists(assistant_name, studio_cfg, args)
     if not assistant_exists:

rasa/studio/{download/flows.py → pull/data.py}

@@ -3,101 +3,16 @@ from pathlib import Path
 from typing import Any, Dict, List, Set, Text
 
 from rasa.shared.core.flows import Flow
-from rasa.shared.core.flows.flow_step_links import StaticFlowStepLink
 from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.flows.yaml_flows_io import YAMLFlowsReader, YamlFlowsWriter
 from rasa.shared.importers.importer import TrainingDataImporter
 from rasa.shared.utils.yaml import read_yaml
 from rasa.studio.constants import STUDIO_NLU_FILENAME
-from rasa.studio.data_handler import StudioDataHandler
 from rasa.utils.mapper import RasaPrimitiveStorageMapper
 
 logger = logging.getLogger(__name__)
 
-STUDIO_FLOWS_DIR_NAME = "studio_flows"
-
-
-def merge_flows_with_overwrite(
-    data_path: Path,
-    handler: Any,
-    data_from_studio: TrainingDataImporter,
-    data_local: TrainingDataImporter,
-    mapper: RasaPrimitiveStorageMapper,
-) -> None:
-    """
-    Merges flows data from a file or directory when overwrite is enabled.
-
-    Args:
-        data_path: List of paths to the training data.
-        handler: The StudioDataHandler instance.
-        data_from_studio: The TrainingDataImporter instance for Studio data.
-        data_local: The TrainingDataImporter instance for local data.
-        mapper: The RasaPrimitiveStorageMapper instance for mapping.
-    """
-    if data_path.is_file():
-        merge_training_data_file(handler, data_from_studio, data_local, data_path)
-    elif data_path.is_dir():
-        merge_training_data_dir(
-            handler, data_from_studio, data_local, data_path, mapper
-        )
-    else:
-        raise ValueError("Provided data path is neither a file nor a directory.")
-
-
-def merge_training_data_file(
-    handler: StudioDataHandler,
-    data_from_studio: TrainingDataImporter,
-    data_local: TrainingDataImporter,
-    file_path: Path,
-) -> None:
-    """
-    Merges NLU and flows data when training data is stored in a single file.
-
-    Args:
-        handler: The StudioDataHandler instance.
-        data_from_studio: The TrainingDataImporter instance for Studio data.
-        data_local: The TrainingDataImporter instance for local data.
-        file_path: The path to the training data file.
-    """
-    if handler.has_nlu():
-        nlu_data_merged = data_from_studio.get_nlu_data().merge(
-            data_local.get_nlu_data()
-        )
-        nlu_data_merged.persist_nlu(file_path)
-
-    if handler.has_flows():
-        flows_data_merged = data_from_studio.get_user_flows().merge(
-            data_local.get_user_flows()
-        )
-        YamlFlowsWriter.dump(
-            flows=flows_data_merged.underlying_flows,
-            filename=file_path,
-            should_clean_json=True,
-        )
-
-
-def merge_training_data_dir(
-    handler: StudioDataHandler,
-    data_from_studio: TrainingDataImporter,
-    data_local: TrainingDataImporter,
-    data_path: Path,
-    mapper: RasaPrimitiveStorageMapper,
-) -> None:
-    """
-    Merges NLU and flows data when training data is stored in a directory.
-
-    Args:
-        handler: The StudioDataHandler instance.
-        data_from_studio: The TrainingDataImporter instance for Studio data.
-        data_local: The TrainingDataImporter instance for local data.
-        data_path: The path to the training data directory.
-        mapper: The RasaPrimitiveStorageMapper instance for mapping.
-    """
-    if handler.has_nlu():
-        merge_nlu_in_directory(data_from_studio, data_local, data_path, mapper)
-
-    if handler.has_flows():
-        merge_flows_in_directory(data_from_studio, data_path, mapper)
+STUDIO_FLOWS_DIR_NAME = "flows"
 
 
 def merge_nlu_in_directory(
@@ -116,7 +31,7 @@ def merge_nlu_in_directory(
         data_path: The path to the training data directory.
         mapper: The RasaPrimitiveStorageMapper instance for mapping.
     """
-    from rasa.studio.download.download import pretty_write_nlu_yaml
+    from rasa.studio.download import pretty_write_nlu_yaml
 
     nlu_data = data_from_studio.get_nlu_data()
     nlu_file_path = get_nlu_path(data_path, data_local, mapper)
@@ -154,29 +69,6 @@ def get_nlu_path(
     return _select_path(nlu_paths, "nlu", base_path, STUDIO_NLU_FILENAME)
 
 
-def get_flows_path(
-    base_path: Path,
-    data_local: TrainingDataImporter,
-    mapper: RasaPrimitiveStorageMapper,
-) -> Path:
-    """Determines where flows data should be stored.
-
-    Args:
-        base_path: The base path for the training data.
-        data_local: The TrainingDataImporter instance for local data.
-        mapper: The RasaPrimitiveStorageMapper instance for mapping.
-
-    Returns:
-        The path where flows data should be stored.
-    """
-    flow_paths = set()
-    for flow in data_local.get_user_flows().underlying_flows:
-        for p in mapper.get_file(flow.id, "flows").get("training", []):
-            flow_paths.add(p)
-
-    return _select_path(flow_paths, "flows", base_path, "flows.yml")
-
-
 def merge_flows_in_directory(
     data_from_studio: TrainingDataImporter,
     data_path: Path,
@@ -298,27 +190,6 @@ def _dump_flows_as_separate_files(flows: List[Any], data_path: Path) -> None:
         )
 
 
-def strip_default_next_references(flows: FlowsList) -> FlowsList:
-    """Strips default next references from flows.
-
-    Args:
-        flows: The FlowsList instance containing the flows.
-
-    Returns:
-        An updated FlowsList instance with default next references removed.
-    """
-    default_step_ids = [step.default_id for flow in flows for step in flow.steps]
-    for flow in flows:
-        for step in flow.steps:
-            if (
-                step.next.links
-                and isinstance(step.next.links[0], StaticFlowStepLink)
-                and step.next.links[0].target in default_step_ids
-            ):
-                step.next.links = []
-    return flows
-
-
 def _select_path(
     paths: Set[Path], primitive_type: str, default_path: Path, default: str
 ) -> Path:

rasa/studio/{download → pull}/domains.py

@@ -10,7 +10,7 @@ from rasa.studio.constants import STUDIO_DOMAIN_FILENAME
 logger = logging.getLogger(__name__)
 
 
-def merge_domain_with_overwrite(
+def merge_domain(
     data_from_studio: TrainingDataImporter,
     data_local: TrainingDataImporter,
     domain_path: Path,