rasa-pro 3.13.5__tar.gz → 3.13.7__tar.gz

{rasa_pro-3.13.5 → rasa_pro-3.13.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.5
+Version: 3.13.7
 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

{rasa_pro-3.13.5 → rasa_pro-3.13.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.13.5"
+version = "3.13.7"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
@@ -382,6 +382,8 @@ convention = "google"
 
 
 
+
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.13.5 → rasa_pro-3.13.7}/rasa/core/nlg/contextual_response_rephraser.py

@@ -24,6 +24,7 @@ from rasa.shared.constants import (
 )
 from rasa.shared.core.domain import KEY_RESPONSES_TEXT, Domain
 from rasa.shared.core.events import BotUttered, UserUttered
+from rasa.shared.core.flows.constants import KEY_TRANSLATION
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.nlu.constants import (
     KEY_COMPONENT_NAME,
@@ -305,22 +306,23 @@ class ContextualResponseRephraser(
         Returns:
             The response with the rephrased text.
         """
-        if not (response_text := response.get(KEY_RESPONSES_TEXT)):
+        translation_response = response.get(KEY_TRANSLATION) or {}
+        lang_code = getattr(tracker.current_language, "code", None)
+        response_text = translation_response.get(
+            lang_code, response.get(KEY_RESPONSES_TEXT)
+        )
+        if not response_text:
             return response
 
         prompt_template_text = self._template_for_response_rephrasing(response)
-
-        # Last user message (=current input) should always be in prompt if available
         last_message_by_user = getattr(tracker.latest_message, "text", "")
         current_input = (
             f"{USER}: {last_message_by_user}" if last_message_by_user else ""
         )
 
-        # Only summarise conversation history if flagged
         if self.summarize_history:
             history = await self._create_history(tracker)
         else:
-            # Count multiple utterances by bot/user as single turn
             turns_wrapper = (
                 _count_multiple_utterances_as_single_turn
                 if self.count_multiple_utterances_as_single_turn
@@ -363,16 +365,20 @@ class ContextualResponseRephraser(
         )
 
         if not (llm_response and llm_response.choices and llm_response.choices[0]):
-            # If the LLM fails to generate a response, return the original response.
             return response
 
         updated_text = llm_response.choices[0]
+
+        if lang_code in translation_response:
+            response[KEY_TRANSLATION][lang_code] = updated_text
+        else:
+            response[KEY_RESPONSES_TEXT] = updated_text
+
         structlogger.debug(
             "nlg.rewrite.complete",
             response_text=response_text,
             updated_text=updated_text,
         )
-        response[KEY_RESPONSES_TEXT] = updated_text
         return response
 
     def does_response_allow_rephrasing(self, template: Dict[Text, Any]) -> bool:

{rasa_pro-3.13.5 → rasa_pro-3.13.7}/rasa/dialogue_understanding/processor/command_processor.py

@@ -398,19 +398,12 @@ def clean_up_commands(
     """
     domain = domain if domain else Domain.empty()
 
-    # we consider all slots that were set in the tracker for potential corrections
-    # in the correct_slot_command we will check if a slot should actually be
-    # corrected
-    slots_so_far = set(
-        [event.key for event in tracker.events if isinstance(event, SlotSet)]
-    )
-
     clean_commands: List[Command] = []
 
     for command in commands:
         if isinstance(command, SetSlotCommand):
             clean_commands = clean_up_slot_command(
-                clean_commands, command, tracker, all_flows, slots_so_far
+                clean_commands, command, tracker, all_flows
             )
 
         elif isinstance(command, CancelFlowCommand) and contains_command(
@@ -501,6 +494,25 @@ def clean_up_commands(
     return clean_commands
 
 
+def _get_slots_eligible_for_correction(tracker: DialogueStateTracker) -> Set[str]:
+    """Get all slots that are eligible for correction.
+
+    # We consider all slots, which are not None, that were set in the tracker
+    # eligible for correction.
+    # In the correct_slot_command we will check if a slot should actually be
+    # corrected.
+    """
+    # get all slots that were set in the tracker
+    slots_so_far = set(
+        [event.key for event in tracker.events if isinstance(event, SlotSet)]
+    )
+
+    # filter out slots that are set to None (None = empty value)
+    slots_so_far = {slot for slot in slots_so_far if tracker.get_slot(slot) is not None}
+
+    return slots_so_far
+
+
 def ensure_max_number_of_command_type(
     commands: List[Command], command_type: Type[Command], n: int
 ) -> List[Command]:
@@ -560,7 +572,6 @@ def clean_up_slot_command(
     command: SetSlotCommand,
     tracker: DialogueStateTracker,
     all_flows: FlowsList,
-    slots_so_far: Set[str],
 ) -> List[Command]:
     """Clean up a slot command.
 
@@ -573,7 +584,6 @@ def clean_up_slot_command(
         command: The command to clean up.
         tracker: The dialogue state tracker.
         all_flows: All flows.
-        slots_so_far: The slots that have been filled so far.
 
     Returns:
         The cleaned up commands.
@@ -642,7 +652,13 @@ def clean_up_slot_command(
             )
             return resulting_commands
 
-    if command.name in slots_so_far and command.name != ROUTE_TO_CALM_SLOT:
+    # get all slots that were set in the tracker and are eligible for correction
+    slots_eligible_for_correction = _get_slots_eligible_for_correction(tracker)
+
+    if (
+        command.name in slots_eligible_for_correction
+        and command.name != ROUTE_TO_CALM_SLOT
+    ):
         current_collect_info = get_current_collect_step(stack, all_flows)
 
         if current_collect_info and current_collect_info.collect == command.name:

{rasa_pro-3.13.5 → rasa_pro-3.13.7}/rasa/studio/upload.py

@@ -115,9 +115,10 @@ def run_validation(args: argparse.Namespace) -> None:
     """
     from rasa.validator import Validator
 
+    training_data_paths = args.data if isinstance(args.data, list) else [args.data]
     training_data_importer = TrainingDataImporter.load_from_dict(
         domain_path=args.domain,
-        training_data_paths=[args.data],
+        training_data_paths=training_data_paths,
         config_path=args.config,
         expand_env_vars=False,
     )
@@ -263,8 +264,9 @@ def build_calm_import_parts(
     domain_from_files = importer.get_user_domain().as_dict()
     domain = extract_values(domain_from_files, DOMAIN_KEYS)
 
+    training_data_paths = data_path if isinstance(data_path, list) else [str(data_path)]
     flow_importer = FlowSyncImporter.load_from_dict(
-        training_data_paths=[str(data_path)], expand_env_vars=False
+        training_data_paths=training_data_paths, expand_env_vars=False
     )
 
     flows = list(flow_importer.get_user_flows())
@@ -272,7 +274,7 @@ def build_calm_import_parts(
     flows = read_yaml(flows_yaml, expand_env_vars=False)
 
     nlu_importer = TrainingDataImporter.load_from_dict(
-        training_data_paths=[str(data_path)], expand_env_vars=False
+        training_data_paths=training_data_paths, expand_env_vars=False
     )
     nlu_data = nlu_importer.get_nlu_data()
     nlu_examples = nlu_data.filter_training_examples(
@@ -349,9 +351,10 @@ def upload_nlu_assistant(
         "rasa.studio.upload.nlu_data_read",
         event_info="Found DM1 assistant data, parsing...",
     )
+    training_data_paths = args.data if isinstance(args.data, list) else [args.data]
     importer = TrainingDataImporter.load_from_dict(
         domain_path=args.domain,
-        training_data_paths=[args.data],
+        training_data_paths=training_data_paths,
         config_path=args.config,
         expand_env_vars=False,
     )

rasa_pro-3.13.7/rasa/studio/utils.py

@@ -0,0 +1,44 @@
+import argparse
+from pathlib import Path
+from typing import List
+
+import rasa.shared.utils.cli
+
+DOMAIN_FILENAME = "domain.yml"
+DEFAULT_CONFIG_PATH = "config.yml"
+DEFAULT_ENDPOINTS_PATH = "endpoints.yml"
+DEFAULT_DATA_PATH = "data"
+
+
+def validate_argument_paths(args: argparse.Namespace) -> None:
+    """Validate every path passed via CLI arguments.
+
+    Args:
+        args: CLI arguments containing paths to validate.
+
+    Raises:
+        rasa.shared.utils.cli.PrintErrorAndExit: If any path does not exist.
+    """
+    invalid_paths: List[str] = []
+
+    def collect_invalid_paths(arg_name: str, default: str) -> None:
+        value = getattr(args, arg_name, None)
+        path_values = value if isinstance(value, list) else [value]
+        for path_value in path_values:
+            if not path_value or path_value == default:
+                continue
+
+            if not Path(path_value).resolve().exists():
+                invalid_paths.append(f"{arg_name}: '{path_value}'")
+
+    collect_invalid_paths("domain", DOMAIN_FILENAME)
+    collect_invalid_paths("config", DEFAULT_CONFIG_PATH)
+    collect_invalid_paths("endpoints", DEFAULT_ENDPOINTS_PATH)
+    collect_invalid_paths("data", DEFAULT_DATA_PATH)
+
+    if invalid_paths:
+        message = (
+            "The following files or directories do not exist:\n  - "
+            + "\n  - ".join(invalid_paths)
+        )
+        rasa.shared.utils.cli.print_error_and_exit(message)

{rasa_pro-3.13.5 → rasa_pro-3.13.7}/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.5"
+__version__ = "3.13.7"

rasa_pro-3.13.5/rasa/studio/utils.py

@@ -1,33 +0,0 @@
-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)