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

rasa/studio/pull/pull.py

@@ -0,0 +1,235 @@
+from __future__ import annotations
+
+import argparse
+from pathlib import Path
+from typing import Any, Tuple
+
+import structlog
+
+import rasa.cli.utils
+import rasa.shared.utils.cli
+from rasa.shared.constants import (
+    DEFAULT_CONFIG_PATH,
+    DEFAULT_DATA_PATH,
+    DEFAULT_DOMAIN_PATH,
+    DEFAULT_DOMAIN_PATHS,
+    DEFAULT_ENDPOINTS_PATH,
+)
+from rasa.shared.importers.importer import TrainingDataImporter
+from rasa.shared.utils.io import write_text_file
+from rasa.studio.config import StudioConfig
+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.utils.mapper import RasaPrimitiveStorageMapper
+
+structlogger = structlog.get_logger(__name__)
+
+
+def handle_pull(args: argparse.Namespace) -> None:
+    """Pull the complete assistant and overwrite all local files.
+
+    Args:
+        args: The command line arguments.
+    """
+    handler = _create_studio_handler()
+    handler.request_all_data()
+
+    _pull_config_file(handler, args.config or DEFAULT_CONFIG_PATH)
+    _pull_endpoints_file(handler, args.endpoints or DEFAULT_ENDPOINTS_PATH)
+
+    domain_path, data_path = _prepare_data_and_domain_paths(args)
+    _merge_domain_and_data(handler, domain_path, data_path)
+
+    structlogger.info(
+        "studio.push.success",
+        event_info="Pulled assistant data from Studio.",
+    )
+    rasa.shared.utils.cli.print_success("Pulled assistant data from Studio.")
+
+
+def handle_pull_config(args: argparse.Namespace) -> None:
+    """Pull nothing but the assistant's `config.yml`.
+
+    Args:
+        args: The command line arguments.
+    """
+    handler = _create_studio_handler()
+    handler.request_all_data()
+
+    _pull_config_file(handler, args.config or DEFAULT_CONFIG_PATH)
+
+    structlogger.info(
+        "studio.push.success",
+        event_info="Pulled assistant data from Studio.",
+    )
+    rasa.shared.utils.cli.print_success("Pulled assistant data from Studio.")
+
+
+def handle_pull_endpoints(args: argparse.Namespace) -> None:
+    """Pull nothing but the assistant's `endpoints.yml`.
+
+    Args:
+        args: The command line arguments.
+    """
+    handler = _create_studio_handler()
+    handler.request_all_data()
+
+    _pull_endpoints_file(handler, args.endpoints or DEFAULT_ENDPOINTS_PATH)
+    structlogger.info(
+        "studio.push.success",
+        event_info="Pulled assistant data from Studio.",
+    )
+    rasa.shared.utils.cli.print_success("Pulled assistant data from Studio.")
+
+
+def _create_studio_handler() -> StudioDataHandler:
+    """Return an initialised StudioDataHandler for the linked assistant.
+
+    Returns:
+        An instance of `StudioDataHandler` for the linked assistant.
+    """
+    assistant_name = read_assistant_name()
+    return StudioDataHandler(
+        studio_config=StudioConfig.read_config(), assistant_name=assistant_name
+    )
+
+
+def _pull_config_file(handler: StudioDataHandler, target_path: str | Path) -> None:
+    """Pull the assistant's `config.yml` file and write it to the specified path.
+
+    Args:
+        handler: The data handler to retrieve the config from.
+        target_path: The path where the config file should be written.
+    """
+    config_yaml = handler.get_config()
+    if not config_yaml:
+        rasa.shared.utils.cli.print_error_and_exit("No config data found in assistant.")
+
+    _write_text(config_yaml, target_path)
+
+
+def _pull_endpoints_file(handler: StudioDataHandler, target_path: str | Path) -> None:
+    """Pull the assistant's `endpoints.yml` file and write it to the specified path.
+
+    Args:
+        handler: The data handler to retrieve the endpoints from.
+        target_path: The path where the endpoints file should be written.
+    """
+    endpoints_yaml = handler.get_endpoints()
+    if not endpoints_yaml:
+        rasa.shared.utils.cli.print_error_and_exit(
+            "No endpoints data found in assistant."
+        )
+
+    _write_text(endpoints_yaml, target_path)
+
+
+def _prepare_data_and_domain_paths(args: argparse.Namespace) -> Tuple[Path, Path]:
+    """Prepars the domain and data paths based on the provided arguments.
+
+    Args:
+        args: The command line arguments.
+
+    Returns:
+        A tuple containing the domain path and a data path.
+    """
+    # Prepare domain path.
+    domain_path = rasa.cli.utils.get_validated_path(
+        args.domain, "domain", DEFAULT_DOMAIN_PATHS, none_is_valid=True
+    )
+    domain_or_default_path = args.domain or DEFAULT_DOMAIN_PATH
+
+    if domain_path is None:
+        domain_path = Path(domain_or_default_path)
+        domain_path.touch()
+
+    if isinstance(domain_path, str):
+        domain_path = Path(domain_path)
+
+    data_path = rasa.cli.utils.get_validated_path(
+        args.data[0], "data", DEFAULT_DATA_PATH, none_is_valid=True
+    )
+
+    data_path = Path(data_path or args.data[0])
+    if not (data_path.is_file() or data_path.is_dir()):
+        data_path.mkdir(parents=True, exist_ok=True)
+
+    return domain_path, data_path
+
+
+def _merge_domain_and_data(
+    handler: StudioDataHandler, domain_path: Path, data_path: Path
+) -> None:
+    """Merge local assistant data with Studio assistant data.
+
+    Args:
+        handler: The data handler to retrieve the assistant data from.
+        domain_path: The path to the local domain file or directory.
+        data_path: The path to the local training data file or directory.
+    """
+    data_from_studio, data_local = import_data_from_studio(
+        handler, domain_path, data_path
+    )
+    mapper = RasaPrimitiveStorageMapper(
+        domain_path=domain_path, training_data_paths=[data_path]
+    )
+
+    merge_domain(data_from_studio, data_local, domain_path)
+    merge_data(data_path, handler, data_from_studio, data_local, mapper)
+
+
+def merge_data(
+    data_path: Path,
+    handler: Any,
+    data_from_studio: TrainingDataImporter,
+    data_local: TrainingDataImporter,
+    mapper: RasaPrimitiveStorageMapper,
+) -> None:
+    """
+    Merges flows data from a file or directory.
+
+    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 not data_path.is_file() and not data_path.is_dir():
+        raise ValueError("Provided data path is neither a file nor a directory.")
+
+    if handler.has_nlu():
+        if data_path.is_file():
+            nlu_data_merged = data_from_studio.get_nlu_data().merge(
+                data_local.get_nlu_data()
+            )
+            nlu_data_merged.persist_nlu(data_path)
+        else:
+            merge_nlu_in_directory(
+                data_from_studio,
+                data_local,
+                data_path,
+                mapper,
+            )
+
+    if handler.has_flows():
+        flows_root = data_path.parent if data_path.is_file() else data_path
+        merge_flows_in_directory(
+            data_from_studio,
+            flows_root,
+            mapper,
+        )
+
+
+def _write_text(content: str, target: str | Path) -> None:
+    """Write `content` to `target`, ensuring parent directories exist.
+
+    Args:
+        content: The content to write to the file.
+        target: The path where the content should be written.
+    """
+    path = Path(target)
+    path.parent.mkdir(parents=True, exist_ok=True)
+    write_text_file(content, path, encoding="utf-8")

rasa/studio/push.py

@@ -0,0 +1,136 @@
+from __future__ import annotations
+
+import argparse
+from pathlib import Path
+from typing import Dict, Text
+
+import structlog
+
+import rasa.shared.utils.cli
+from rasa.shared.core.flows.yaml_flows_io import YamlFlowsWriter
+from rasa.shared.importers.importer import TrainingDataImporter
+from rasa.shared.nlu.training_data.formats.rasa_yaml import RasaYAMLWriter
+from rasa.shared.utils.io import read_file
+from rasa.shared.utils.yaml import dump_obj_as_yaml_to_string
+from rasa.studio.config import StudioConfig
+from rasa.studio.link import get_studio_config, read_assistant_name
+from rasa.studio.upload import (
+    build_import_request,
+    make_request,
+    run_validation,
+)
+
+structlogger = structlog.get_logger(__name__)
+
+
+def _send_to_studio(
+    assistant_name: Text,
+    payload_parts: Dict[Text, Text],
+    studio_cfg: StudioConfig,
+) -> None:
+    """Build the GraphQL request and send it.
+
+    Args:
+        assistant_name: The name of the assistant.
+        payload_parts: The parts of the payload to send.
+        studio_cfg: The StudioConfig object.
+    """
+    graphql_req = build_import_request(
+        assistant_name=assistant_name,
+        flows_yaml=payload_parts.get("flows"),
+        domain_yaml=payload_parts.get("domain"),
+        config_yaml=payload_parts.get("config"),
+        endpoints=payload_parts.get("endpoints"),
+        nlu_yaml=payload_parts.get("nlu"),
+    )
+    verify = not studio_cfg.disable_verify
+    result = make_request(studio_cfg.studio_url, graphql_req, verify)
+    if not result.was_successful:
+        rasa.shared.utils.cli.print_error_and_exit(result.message)
+
+    structlogger.info(
+        "studio.push.success",
+        event_info=f"Pushed data to assistant '{assistant_name}'.",
+        assistant_name=assistant_name,
+    )
+    rasa.shared.utils.cli.print_success(f"Pushed data to assistant '{assistant_name}'.")
+
+
+def handle_push(args: argparse.Namespace) -> None:
+    """Push the entire assistant.
+
+    Args:
+        args: The command line arguments.
+    """
+    studio_cfg = get_studio_config()
+
+    run_validation(args)
+
+    importer = TrainingDataImporter.load_from_dict(
+        domain_path=args.domain,
+        config_path=args.config,
+        expand_env_vars=False,
+    )
+
+    domain_yaml = dump_obj_as_yaml_to_string(importer.get_user_domain().as_dict())
+    config_yaml = read_file(Path(args.config))
+    endpoints_yaml = read_file(Path(args.endpoints))
+
+    flow_importer = TrainingDataImporter.load_from_dict(
+        training_data_paths=args.data, expand_env_vars=False
+    )
+    flows_yaml = YamlFlowsWriter().dumps(flow_importer.get_user_flows())
+
+    nlu_importer = TrainingDataImporter.load_from_dict(
+        training_data_paths=args.data, expand_env_vars=False
+    )
+    nlu_yaml = RasaYAMLWriter().dumps(nlu_importer.get_nlu_data())
+
+    assistant_name = read_assistant_name()
+    _send_to_studio(
+        assistant_name,
+        {
+            "flows": flows_yaml,
+            "domain": domain_yaml,
+            "config": config_yaml,
+            "endpoints": endpoints_yaml,
+            "nlu": nlu_yaml,
+        },
+        studio_cfg,
+    )
+
+
+def handle_push_config(args: argparse.Namespace) -> None:
+    """Push only the assistant configuration (config.yml).
+
+    Args:
+        args: The command line arguments.
+    """
+    studio_cfg = get_studio_config()
+    assistant_name = read_assistant_name()
+
+    config_yaml = read_file(Path(args.config))
+    if not config_yaml:
+        rasa.shared.utils.cli.print_error_and_exit(
+            "No configuration data was found in the assistant."
+        )
+
+    _send_to_studio(assistant_name, {"config": config_yaml}, studio_cfg)
+
+
+def handle_push_endpoints(args: argparse.Namespace) -> None:
+    """Push only the endpoints configuration (endpoints.yml).
+
+    Args:
+        args: The command line arguments.
+    """
+    studio_cfg = get_studio_config()
+    assistant_name = read_assistant_name()
+
+    endpoints_yaml = read_file(Path(args.endpoints))
+    if not endpoints_yaml:
+        rasa.shared.utils.cli.print_error_and_exit(
+            "No endpoints data was found in the assistant."
+        )
+
+    _send_to_studio(assistant_name, {"endpoints": endpoints_yaml}, studio_cfg)

rasa/studio/train.py

@@ -34,7 +34,7 @@ def handle_train(args: argparse.Namespace) -> Optional[str]:
     from rasa.api import train as train_all
 
     handler = StudioDataHandler(
-        studio_config=StudioConfig.read_config(), assistant_name=args.assistant_name[0]
+        studio_config=StudioConfig.read_config(), assistant_name=args.assistant_name
     )
     if args.entities or args.intents:
         handler.request_data(args.intents, args.entities)

rasa/studio/upload.py

@@ -2,11 +2,12 @@ import argparse
 import base64
 import re
 import sys
-from typing import Any, Dict, Iterable, List, Set, Text, Tuple, Union
+from typing import Any, Dict, Iterable, List, Optional, Set, Text, Tuple, Union
 
 import questionary
 import requests
 import structlog
+from pydantic import BaseModel, Field
 
 import rasa.cli.telemetry
 import rasa.cli.utils
@@ -32,6 +33,7 @@ from rasa.shared.nlu.training_data.formats.rasa_yaml import (
 )
 from rasa.shared.utils.yaml import (
     dump_obj_as_yaml_to_string,
+    read_yaml,
     read_yaml_file,
 )
 from rasa.studio import results_logger
@@ -64,6 +66,16 @@ DOMAIN_KEYS = [
 ]
 
 
+class CALMImportParts(BaseModel):
+    """All pieces that will be uploaded to Rasa Studio."""
+
+    flows: Dict[str, Any]
+    domain: Dict[str, Any]
+    config: Dict[str, Any]
+    endpoints: Dict[str, Any]
+    nlu: Dict[str, Any] = Field(default_factory=dict)
+
+
 def _get_selected_entities_and_intents(
     args: argparse.Namespace,
     intents_from_files: Set[Text],
@@ -208,79 +220,93 @@ def _get_assistant_name(config: Dict[Text, Any]) -> str:
     return assistant_name
 
 
-@with_studio_error_handler
-def upload_calm_assistant(
-    args: argparse.Namespace, endpoint: str, verify: bool = True
-) -> StudioResult:
-    """Validates and uploads the CALM assistant data to Rasa Studio.
+def build_calm_import_parts(
+    data_path: Union[Text, List[Text]],
+    domain_path: Text,
+    config_path: Text,
+    endpoints_path: Optional[Text] = None,
+    assistant_name: Optional[Text] = None,
+) -> Tuple[str, CALMImportParts]:
+    """Builds the parts of the assistant to be uploaded to Studio.
 
     Args:
-        args: The command line arguments
-            - data: The path to the training data
-            - domain: The path to the domain
-            - flows: The path to the flows
-            - endpoints: The path to the endpoints
-            - config: The path to the config
-        endpoint: The studio endpoint
-        verify: Whether to verify SSL
+        data_path: The path to the training data
+        domain_path: The path to the domain
+        config_path: The path to the config
+        endpoints_path: The path to the endpoints
+        assistant_name: The name of the assistant
+
     Returns:
-        None
+        The assistant name and the parts to be uploaded
     """
-    run_validation(args)
-
-    structlogger.info(
-        "rasa.studio.upload.loading_data", event_info="Parsing CALM assistant data..."
-    )
-
     importer = TrainingDataImporter.load_from_dict(
-        domain_path=args.domain,
-        config_path=args.config,
+        domain_path=domain_path,
+        config_path=config_path,
         expand_env_vars=False,
     )
 
-    # Prepare config and domain
-    config = importer.get_config()
-    assistant_name = _get_assistant_name(config)
+    config = read_yaml_file(config_path, expand_env_vars=False)
+    endpoints = read_yaml_file(endpoints_path, expand_env_vars=False)
+    assistant_name = assistant_name or _get_assistant_name(config)
 
-    config_from_files = read_yaml_file(args.config, expand_env_vars=False)
     domain_from_files = importer.get_user_domain().as_dict()
-
-    # Extract domain and config values
     domain = extract_values(domain_from_files, DOMAIN_KEYS)
 
-    # Prepare flows
     flow_importer = FlowSyncImporter.load_from_dict(
-        training_data_paths=args.data, expand_env_vars=False
+        training_data_paths=data_path, expand_env_vars=False
     )
+
     flows = list(flow_importer.get_user_flows())
+    flows_yaml = YamlFlowsWriter().dumps(flows)
+    flows = read_yaml(flows_yaml, expand_env_vars=False)
 
-    # We instantiate the TrainingDataImporter again on purpose to avoid
-    # adding patterns to domain's actions. More info https://t.ly/W8uuc
     nlu_importer = TrainingDataImporter.load_from_dict(
-        training_data_paths=args.data, expand_env_vars=False
+        training_data_paths=data_path, expand_env_vars=False
     )
     nlu_data = nlu_importer.get_nlu_data()
     nlu_examples = nlu_data.filter_training_examples(
         lambda ex: ex.get("intent") in nlu_data.intents
     )
     nlu_examples_yaml = RasaYAMLWriter().dumps(nlu_examples)
+    nlu = read_yaml(nlu_examples_yaml, expand_env_vars=False)
+
+    parts = CALMImportParts(
+        flows=flows,
+        domain=domain,
+        config=config,
+        endpoints=endpoints,
+        nlu=nlu,
+    )
+
+    return assistant_name, parts
+
+
+@with_studio_error_handler
+def upload_calm_assistant(
+    args: argparse.Namespace, endpoint: str, verify: bool = True
+) -> StudioResult:
+    def yaml_or_empty(part: Dict[Text, Any]) -> Optional[str]:
+        return dump_obj_as_yaml_to_string(part) if part else None
 
-    # Prepare endpoints
-    endpoints_from_files = read_yaml_file(args.endpoints, expand_env_vars=False)
-    endpoints_str = dump_obj_as_yaml_to_string(
-        endpoints_from_files, transform=remove_quotes
+    run_validation(args)
+    structlogger.info(
+        "rasa.studio.upload.loading_data", event_info="Parsing CALM assistant data..."
+    )
+    assistant_name, parts = build_calm_import_parts(
+        data_path=args.data,
+        domain_path=args.domain,
+        config_path=args.config,
+        endpoints_path=args.endpoints,
     )
 
-    # Build GraphQL request
     graphql_req = build_import_request(
         assistant_name,
-        flows_yaml=YamlFlowsWriter().dumps(flows),
-        domain_yaml=dump_obj_as_yaml_to_string(domain),
-        config_yaml=dump_obj_as_yaml_to_string(config_from_files),
-        endpoints=endpoints_str,
-        nlu_yaml=nlu_examples_yaml,
+        flows_yaml=yaml_or_empty(parts.flows),
+        domain_yaml=yaml_or_empty(parts.domain),
+        config_yaml=yaml_or_empty(parts.config),
+        endpoints=yaml_or_empty(parts.endpoints),
+        nlu_yaml=yaml_or_empty(parts.nlu),
     )
-
     structlogger.info(
         "rasa.studio.upload.calm", event_info="Uploading to Rasa Studio..."
     )
@@ -393,7 +419,6 @@ def make_request(endpoint: str, graphql_req: Dict, verify: bool = True) -> Studi
         },
         verify=verify,
     )
-
     if results_logger.response_has_errors(res.json()):
         track_upload_to_studio_failed(res.json())
         return StudioResult.error(res.json())
@@ -421,39 +446,64 @@ def _add_missing_entities(
 
 def build_import_request(
     assistant_name: str,
-    flows_yaml: str,
-    domain_yaml: str,
-    config_yaml: str,
-    endpoints: str,
-    nlu_yaml: str = "",
+    flows_yaml: Optional[str] = None,
+    domain_yaml: Optional[str] = None,
+    config_yaml: Optional[str] = None,
+    endpoints: Optional[str] = None,
+    nlu_yaml: Optional[str] = None,
 ) -> Dict:
-    # b64encode expects bytes and returns bytes so we need to decode to string
-    base64_domain = base64.b64encode(domain_yaml.encode("utf-8")).decode("utf-8")
-    base64_flows = base64.b64encode(flows_yaml.encode("utf-8")).decode("utf-8")
-    base64_config = base64.b64encode(config_yaml.encode("utf-8")).decode("utf-8")
-    base64_nlu = base64.b64encode(nlu_yaml.encode("utf-8")).decode("utf-8")
-    base64_endpoints = base64.b64encode(endpoints.encode("utf-8")).decode("utf-8")
+    """Builds the GraphQL request for uploading a modern assistant.
+
+    Args:
+        assistant_name: The name of the assistant
+        flows_yaml: The YAML representation of the flows
+        domain_yaml: The YAML representation of the domain
+        config_yaml: The YAML representation of the config
+        endpoints: The YAML representation of the endpoints
+        nlu_yaml: The YAML representation of the NLU data
+
+    Returns:
+        A dictionary representing the GraphQL request for uploading the assistant.
+    """
+    inputs_map = {
+        "domain": domain_yaml,
+        "flows": flows_yaml,
+        "config": config_yaml,
+        "endpoints": endpoints,
+        "nlu": nlu_yaml,
+    }
+
+    payload = {
+        field: convert_string_to_base64(value)
+        for field, value in inputs_map.items()
+        if value is not None
+    }
+
+    variables_input = {"assistantName": assistant_name, **payload}
 
     graphql_req = {
         "query": (
             "mutation UploadModernAssistant($input: UploadModernAssistantInput!)"
             "{\n  uploadModernAssistant(input: $input)\n}"
         ),
-        "variables": {
-            "input": {
-                "assistantName": assistant_name,
-                "domain": base64_domain,
-                "flows": base64_flows,
-                "nlu": base64_nlu,
-                "config": base64_config,
-                "endpoints": base64_endpoints,
-            }
-        },
+        "variables": {"input": variables_input},
     }
 
     return graphql_req
 
 
+def convert_string_to_base64(string: str) -> str:
+    """Converts a string to base64.
+
+    Args:
+        string: The string to convert
+
+    Returns:
+        The base64 encoded string
+    """
+    return base64.b64encode(string.encode("utf-8")).decode("utf-8")
+
+
 def build_request(
     assistant_name: str, nlu_examples_yaml: str, domain_yaml: str
 ) -> Dict: