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

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,

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

@@ -48,6 +48,11 @@ def _send_to_studio(
     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}'.")
 
 

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/tracing/instrumentation/attribute_extractors.py

@@ -64,7 +64,10 @@ from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.core.training_data.structures import StoryGraph
 from rasa.shared.importers.importer import TrainingDataImporter
 from rasa.shared.nlu.constants import INTENT_NAME_KEY, SET_SLOT_COMMAND
-from rasa.shared.utils.llm import combine_custom_and_default_config
+from rasa.shared.utils.llm import (
+    combine_custom_and_default_config,
+    resolve_model_client_config,
+)
 from rasa.tracing.constants import (
     PROMPT_TOKEN_LENGTH_ATTRIBUTE_NAME,
     REQUEST_BODY_SIZE_IN_BYTES_ATTRIBUTE_NAME,
@@ -335,9 +338,8 @@ def extract_llm_config(
     else:
         config = self.config
 
-    llm_property = combine_custom_and_default_config(
-        config.get(LLM_CONFIG_KEY), default_llm_config
-    )
+    llm_config = resolve_model_client_config(config.get(LLM_CONFIG_KEY))
+    llm_property = combine_custom_and_default_config(llm_config, default_llm_config)
 
     if isinstance(self, LLMBasedCommandGenerator):
         flow_retrieval_config = config.get(FLOW_RETRIEVAL_KEY, {}) or {}
@@ -346,8 +348,11 @@ def extract_llm_config(
             default_embeddings_config,
         )
     else:
+        embeddings_config = resolve_model_client_config(
+            config.get(EMBEDDINGS_CONFIG_KEY)
+        )
         embeddings_property = combine_custom_and_default_config(
-            config.get(EMBEDDINGS_CONFIG_KEY), default_embeddings_config
+            embeddings_config, default_embeddings_config
         )
 
     attributes = {
@@ -821,7 +826,16 @@ def compute_prompt_tokens_length(
         )
         model_name = f"{model_name}-0613"
 
-    encoding = tiktoken.encoding_for_model(model_name)
+    try:
+        encoding = tiktoken.encoding_for_model(model_name)
+    except KeyError:
+        # Fallback for unknown models
+        logger.warning(
+            f"Unknown model name '{model_name}', "
+            f"using 'cl100k_base' encoding as fallback."
+        )
+        encoding = tiktoken.get_encoding("cl100k_base")
+
     return len(encoding.encode(prompt))
 
 

rasa/utils/common.py

@@ -280,6 +280,7 @@ def configure_library_logging() -> None:
     update_matplotlib_log_level(library_log_level)
     update_kafka_log_level(library_log_level)
     update_rabbitmq_log_level(library_log_level)
+    update_websockets_log_level(library_log_level)
 
 
 def update_apscheduler_log_level() -> None:
@@ -404,6 +405,16 @@ def update_rabbitmq_log_level(library_log_level: Text) -> None:
     logging.getLogger("aiormq").setLevel(log_level)
 
 
+def update_websockets_log_level(library_log_level: Text) -> None:
+    """Set the log level of websockets.
+
+    Uses the library specific log level or the general libraries log level.
+    """
+    log_level = os.environ.get(ENV_LOG_LEVEL_LIBRARIES, library_log_level)
+    logging.getLogger("websockets").setLevel(log_level)
+    logging.getLogger("websockets").propagate = False
+
+
 def sort_list_of_dicts_by_first_key(dicts: List[Dict]) -> List[Dict]:
     """Sorts a list of dictionaries by their first key."""
     return sorted(dicts, key=lambda d: next(iter(d.keys())))

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.13.0.dev20250613"
+__version__ = "3.13.0rc1"

{rasa_pro-3.13.0.dev20250613.dist-info → rasa_pro-3.13.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.0.dev20250613
+Version: 3.13.0rc1
 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
@@ -23,7 +23,7 @@ Provides-Extra: spacy
 Provides-Extra: transformers
 Requires-Dist: CacheControl (>=0.14.2,<0.15.0)
 Requires-Dist: PyJWT[crypto] (>=2.8.0,<3.0.0)
-Requires-Dist: SQLAlchemy (>=2.0.40,<2.1.0)
+Requires-Dist: SQLAlchemy (>=2.0.41,<2.1.0)
 Requires-Dist: absl-py (>=2.0,<2.1)
 Requires-Dist: aio-pika (>=8.2.3,<9.4.4)
 Requires-Dist: aiogram (>=3.15,<3.16)
@@ -91,7 +91,7 @@ Requires-Dist: pymongo (>=4.10.1,<4.11.0)
 Requires-Dist: pypred (>=0.4.0,<0.5.0)
 Requires-Dist: python-dateutil (>=2.8.2,<2.9.0)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
-Requires-Dist: python-engineio (>=4.12.0,<6,!=5.0.0)
+Requires-Dist: python-engineio (>=4.12.2,<4.13.0)
 Requires-Dist: python-keycloak (>=3.12.0,<4.0.0)
 Requires-Dist: python-socketio (>=5.8,<6)
 Requires-Dist: pytz (>=2022.7.1,<2023.0)
@@ -99,7 +99,7 @@ Requires-Dist: pyyaml (>=6.0)
 Requires-Dist: qdrant-client (>=1.9.1,<1.10.0)
 Requires-Dist: questionary (>=1.10.0,<2.1.0)
 Requires-Dist: randomname (>=0.2.1,<0.3.0)
-Requires-Dist: rasa-sdk (==3.13.0.dev1)
+Requires-Dist: rasa-sdk (==3.13.0rc1)
 Requires-Dist: redis (>=4.6.0,<6.0)
 Requires-Dist: regex (>=2024.7.24,<2024.8.0)
 Requires-Dist: requests (>=2.32.3,<2.33.0)