rasa-pro 3.13.6__py3-none-any.whl → 3.13.7__py3-none-any.whl

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/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/version.py

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

{rasa_pro-3.13.6.dist-info → rasa_pro-3.13.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.6
+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.6.dist-info → rasa_pro-3.13.7.dist-info}/RECORD

@@ -443,7 +443,7 @@ rasa/dialogue_understanding/patterns/skip_question.py,sha256=fJ1MC0WEEtS-BpnGJEf
 rasa/dialogue_understanding/patterns/user_silence.py,sha256=xP-QMnd-MsybH5z4g01hBv4OLOHcw6m3rc26LQfe2zo,1140
 rasa/dialogue_understanding/patterns/validate_slot.py,sha256=hqd5AEGT3M3HLNhMwuI9W9kZNCvgU6GyI-2xc2b4kz8,2085
 rasa/dialogue_understanding/processor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rasa/dialogue_understanding/processor/command_processor.py,sha256=QXurL-xRTuwU3-j4INbQmMZw8ed9uyErcQoT31Yix5o,33004
+rasa/dialogue_understanding/processor/command_processor.py,sha256=X1sc0y1nPhmHiDRaREVCbIblsLIoAny7S1eQq6BNVmI,33507
 rasa/dialogue_understanding/processor/command_processor_component.py,sha256=rkErI_Uo7s3LsEojUSGSRbWGyGaX7GtGOYSJn0V-TI4,1650
 rasa/dialogue_understanding/stack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/dialogue_understanding/stack/dialogue_stack.py,sha256=cYV6aQeh0EuOJHODDqK3biqXozYTX8baPgLwHhPxFqs,5244
@@ -798,7 +798,7 @@ rasa/studio/pull/pull.py,sha256=Qr-Ms4pXNS04hvdciZCfbeC1hag6v2puwhHwhcFpA8Q,7750
 rasa/studio/push.py,sha256=_EopU6RQnbQub33x0TVXOTWCYUfOQMDc6KdDNmltLMs,4279
 rasa/studio/results_logger.py,sha256=lwKROoQjzzJVnFoceLQ-z-5Hg35TfHo-8R4MDrMLYHY,5126
 rasa/studio/train.py,sha256=-UTPABXNWlnp3iIMKeslgprEtRQWcr8mF-Q7bacKxEw,4240
-rasa/studio/upload.py,sha256=Ssop8gTrBDj4JTrI35bdiKy7IWmUV_I3YXgXM-DIXSo,22648
+rasa/studio/upload.py,sha256=2zK0ThEcIRUd_PEYWuPpQNAwbATV_38GveTVZJZNysM,22927
 rasa/studio/utils.py,sha256=WgPbmMcdb3yuZU36zxFqUkJwqi5ma7TZT4Y-mXYe54k,1429
 rasa/telemetry.py,sha256=2W1Tq1HMQm60o5oiy5DEGrIqSlpYMaJybY4DvCa6Gg8,69712
 rasa/tracing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -846,9 +846,9 @@ rasa/utils/train_utils.py,sha256=ClJx-6x3-h3Vt6mskacgkcCUJTMXjFPe3zAcy_DfmaU,212
 rasa/utils/url_tools.py,sha256=dZ1HGkVdWTJB7zYEdwoDIrEuyX9HE5WsxKKFVsXBLE0,1218
 rasa/utils/yaml.py,sha256=KjbZq5C94ZP7Jdsw8bYYF7HASI6K4-C_kdHfrnPLpSI,2000
 rasa/validator.py,sha256=fhRlHQvuBkiup0FnNYmwRmqQwC3QpdCJt0TuvW4jMaI,83125
-rasa/version.py,sha256=7fxIP1R0Ox9pq9ce7whc6LA_D3UwwS6902VsPX1o8Bo,117
-rasa_pro-3.13.6.dist-info/METADATA,sha256=yZBwGIG27TynAKlkqS93_4hobShKknNbFhYslp1hSpQ,10550
-rasa_pro-3.13.6.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.13.6.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rasa_pro-3.13.6.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.13.6.dist-info/RECORD,,
+rasa/version.py,sha256=GlcM0pFNhVbXo6QlI3F-A0EzUA4hWRvVKqt9sKLpQJg,117
+rasa_pro-3.13.7.dist-info/METADATA,sha256=aiVBXTbG5rIltucREZ_XZdurUzZDyz8X2R__8fYF0dw,10550
+rasa_pro-3.13.7.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.13.7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rasa_pro-3.13.7.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.13.7.dist-info/RECORD,,