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

rasa/studio/upload.py

@@ -31,6 +31,7 @@ from rasa.shared.nlu.training_data.formats.rasa_yaml import (
     RasaYAMLReader,
     RasaYAMLWriter,
 )
+from rasa.shared.utils.llm import collect_custom_prompts
 from rasa.shared.utils.yaml import (
     dump_obj_as_yaml_to_string,
     read_yaml,
@@ -40,6 +41,7 @@ from rasa.studio import results_logger
 from rasa.studio.auth import KeycloakTokenReader
 from rasa.studio.config import StudioConfig
 from rasa.studio.results_logger import StudioResult, with_studio_error_handler
+from rasa.studio.utils import validate_argument_paths
 from rasa.telemetry import track_upload_to_studio_failed
 
 structlogger = structlog.get_logger()
@@ -115,7 +117,7 @@ def run_validation(args: argparse.Namespace) -> None:
 
     training_data_importer = TrainingDataImporter.load_from_dict(
         domain_path=args.domain,
-        training_data_paths=args.data,
+        training_data_paths=[args.data],
         config_path=args.config,
         expand_env_vars=False,
     )
@@ -142,6 +144,7 @@ def run_validation(args: argparse.Namespace) -> None:
 
 def handle_upload(args: argparse.Namespace) -> None:
     """Uploads primitives to rasa studio."""
+    validate_argument_paths(args)
     studio_config = StudioConfig.read_config()
     endpoint = studio_config.studio_url
     verify = not studio_config.disable_verify
@@ -166,6 +169,13 @@ def handle_upload(args: argparse.Namespace) -> None:
         args.config, "config", DEFAULT_CONFIG_PATH
     )
 
+    config = read_yaml_file(args.config, expand_env_vars=False)
+    assistant_name = args.assistant_name or _get_assistant_name(config)
+    if not _handle_existing_assistant(
+        assistant_name, studio_config.studio_url, verify, args
+    ):
+        return
+
     Domain.expand_env_vars = False
     RasaYAMLReader.expand_env_vars = False
     YAMLFlowsReader.expand_env_vars = False
@@ -253,7 +263,7 @@ def build_calm_import_parts(
     domain = extract_values(domain_from_files, DOMAIN_KEYS)
 
     flow_importer = FlowSyncImporter.load_from_dict(
-        training_data_paths=data_path, expand_env_vars=False
+        training_data_paths=[str(data_path)], expand_env_vars=False
     )
 
     flows = list(flow_importer.get_user_flows())
@@ -261,7 +271,7 @@ def build_calm_import_parts(
     flows = read_yaml(flows_yaml, expand_env_vars=False)
 
     nlu_importer = TrainingDataImporter.load_from_dict(
-        training_data_paths=data_path, expand_env_vars=False
+        training_data_paths=[str(data_path)], expand_env_vars=False
     )
     nlu_data = nlu_importer.get_nlu_data()
     nlu_examples = nlu_data.filter_training_examples(
@@ -297,8 +307,10 @@ def upload_calm_assistant(
         domain_path=args.domain,
         config_path=args.config,
         endpoints_path=args.endpoints,
+        assistant_name=args.assistant_name,
     )
 
+    prompts_json = collect_custom_prompts(parts.config, parts.endpoints)
     graphql_req = build_import_request(
         assistant_name,
         flows_yaml=yaml_or_empty(parts.flows),
@@ -306,7 +318,9 @@ def upload_calm_assistant(
         config_yaml=yaml_or_empty(parts.config),
         endpoints=yaml_or_empty(parts.endpoints),
         nlu_yaml=yaml_or_empty(parts.nlu),
+        prompts_json=prompts_json,
     )
+
     structlogger.info(
         "rasa.studio.upload.calm", event_info="Uploading to Rasa Studio..."
     )
@@ -336,7 +350,7 @@ def upload_nlu_assistant(
     )
     importer = TrainingDataImporter.load_from_dict(
         domain_path=args.domain,
-        training_data_paths=args.data,
+        training_data_paths=[args.data],
         config_path=args.config,
         expand_env_vars=False,
     )
@@ -451,6 +465,7 @@ def build_import_request(
     config_yaml: Optional[str] = None,
     endpoints: Optional[str] = None,
     nlu_yaml: Optional[str] = None,
+    prompts_json: Optional[Dict[str, str]] = None,
 ) -> Dict:
     """Builds the GraphQL request for uploading a modern assistant.
 
@@ -461,6 +476,7 @@ def build_import_request(
         config_yaml: The YAML representation of the config
         endpoints: The YAML representation of the endpoints
         nlu_yaml: The YAML representation of the NLU data
+        prompts_json: The JSON representation of the prompts
 
     Returns:
         A dictionary representing the GraphQL request for uploading the assistant.
@@ -473,12 +489,15 @@ def build_import_request(
         "nlu": nlu_yaml,
     }
 
-    payload = {
+    payload: Dict[Text, Any] = {
         field: convert_string_to_base64(value)
         for field, value in inputs_map.items()
         if value is not None
     }
 
+    if prompts_json:
+        payload["prompts"] = prompts_json
+
     variables_input = {"assistantName": assistant_name, **payload}
 
     graphql_req = {
@@ -677,3 +696,40 @@ def build_get_assistant_by_name_request(
         },
     }
     return graphql_req
+
+
+def _handle_existing_assistant(
+    assistant_name: str,
+    endpoint: str,
+    verify: bool,
+    args: argparse.Namespace,
+) -> bool:
+    """Deal with the case that an assistant with the same name already exists.
+
+    Args:
+        assistant_name: The name of the assistant
+        endpoint: The studio endpoint
+        verify: Whether to verify SSL
+        args: The command line arguments
+
+    Returns:
+        bool: True if the assistant does not exist and can be created,
+              False if the assistant already exists and was linked.
+    """
+    from rasa.studio.link import handle_link
+
+    if not check_if_assistant_already_exists(assistant_name, endpoint, verify):
+        return True
+
+    should_link = questionary.confirm(
+        f"An assistant named {assistant_name} already exists in Studio. "
+        f"Would you like to link your local project to this existing assistant?"
+    ).ask()
+
+    if not should_link:
+        rasa.shared.utils.cli.print_error_and_exit("Upload cancelled.")
+        return False
+
+    args.assistant_name = assistant_name
+    handle_link(args)
+    return False

rasa/studio/utils.py

@@ -0,0 +1,33 @@
+import argparse
+from pathlib import Path
+
+import rasa.shared.utils.cli
+from rasa.shared.constants import (
+    DEFAULT_CONFIG_PATH,
+    DEFAULT_DATA_PATH,
+    DEFAULT_ENDPOINTS_PATH,
+)
+from rasa.studio.constants import DOMAIN_FILENAME
+
+
+def validate_argument_paths(args: argparse.Namespace) -> None:
+    """Validates the paths provided in the command line arguments.
+
+    Args:
+        args: The command line arguments containing paths to validate.
+    """
+
+    def validate_path(arg_name: str, default: str) -> None:
+        path_value = getattr(args, arg_name, None)
+        if path_value and path_value != default:
+            resolved_path = Path(path_value).resolve()
+            if not resolved_path.exists():
+                rasa.shared.utils.cli.print_error_and_exit(
+                    f"{arg_name.capitalize()} file or directory "
+                    f"'{path_value}' does not exist."
+                )
+
+    validate_path("domain", DOMAIN_FILENAME)
+    validate_path("config", DEFAULT_CONFIG_PATH)
+    validate_path("endpoints", DEFAULT_ENDPOINTS_PATH)
+    validate_path("data", DEFAULT_DATA_PATH)

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 = {
@@ -814,14 +819,23 @@ def compute_prompt_tokens_length(
         )
         return None
 
-    if model_name in ["gpt-3.5-turbo", "gpt-4"]:
+    if model_name == "gpt-4":
         logger.debug(
             f"Model {model_name} may update over time. "
             f"Returning num tokens assuming model '{model_name}-0613.'"
         )
         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.0rc2"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.0.dev20250613
+Version: 3.13.0rc2
 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)