rasa-pro 3.13.3__py3-none-any.whl → 3.13.5__py3-none-any.whl

rasa/core/channels/inspector/yarn.lock

@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
-"@adobe/css-tools@^4.3.1":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28"
-  integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==
+"@adobe/css-tools@^4.3.1", "@adobe/css-tools@^4.3.2":
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.3.tgz#beebbefb0264fdeb32d3052acae0e0d94315a9a2"
+  integrity sha512-VQKMkwriZbaOgVCby1UDY/LDk5fIjhQicCvVPFqfe+69fWaPWydbWJ3wRt59/YzIwda1I81loas3oCoHxnqvdA==
 
 "@ampproject/remapping@^2.2.0":
   version "2.2.1"
@@ -2300,10 +2300,10 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-axios@1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"
-  integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==
+axios@1.8.2:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
+  integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"
@@ -6064,10 +6064,10 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^2.0.0"
 
-vite@4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.2.tgz#d6ea8610e099851dad8c7371599969e0f8b97e82"
-  integrity sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==
+vite@4.5.12:
+  version "4.5.12"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.12.tgz#48f48dbcf789722765e91bc32a99cb66c628eadc"
+  integrity sha512-qrMwavANtSz91nDy3zEiUHMtL09x0mniQsSMvDkNxuCBM1W5vriJ22hEmwTth6DhLSWsZnHBT0yHFAQXt6efGA==
   dependencies:
     esbuild "^0.18.10"
     postcss "^8.4.27"

rasa/core/policies/enterprise_search_policy.py

@@ -50,6 +50,7 @@ from rasa.engine.graph import ExecutionContext
 from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
+from rasa.exceptions import EnterpriseSearchPolicyError
 from rasa.graph_components.providers.forms_provider import Forms
 from rasa.graph_components.providers.responses_provider import Responses
 from rasa.shared.constants import (
@@ -82,7 +83,6 @@ from rasa.shared.providers.embedding._langchain_embedding_client_adapter import
     _LangchainEmbeddingClientAdapter,
 )
 from rasa.shared.providers.llm.llm_response import LLMResponse, measure_llm_latency
-from rasa.shared.utils.cli import print_error_and_exit
 from rasa.shared.utils.constants import (
     LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,
     LOG_COMPONENT_SOURCE_METHOD_INIT,
@@ -343,14 +343,11 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
         try:
             embeddings = self._create_plain_embedder(self.embeddings_config)
         except (ValidationError, Exception) as e:
-            structlogger.error(
-                "enterprise_search_policy.train.embedder_instantiation_failed",
-                message="Unable to instantiate the embedding client.",
-                error=e,
-            )
-            print_error_and_exit(
-                "Unable to create embedder. Please make sure you specified the "
-                f"required environment variables. Error: {e}"
+            raise EnterpriseSearchPolicyError(
+                code="core.policies.enterprise_search_policy.train"
+                ".embedder_instantiation_failed",
+                event_info=f"Unable to create embedder. Please make sure you "
+                f"specified the required environment variables. Error: {e}",
             )
 
         if self.vector_store_type == DEFAULT_VECTOR_STORE_TYPE:
@@ -788,23 +785,23 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
                 "Please specify a valid path to the documents source directory in the "
                 "vector_store configuration."
             )
-            structlogger.error(
-                "enterprise_search_policy.train.faiss.invalid_source_directory",
-                message=error_message,
+            error_code = (
+                "core.policies.enterprise_search_policy.train"
+                ".faiss.invalid_source_directory"
             )
-            print_error_and_exit(error_message)
+            raise EnterpriseSearchPolicyError(code=error_code, event_info=error_message)
 
-        docs = glob.glob(os.path.join(docs_folder, "*.txt"), recursive=True)
+        docs = glob.glob(os.path.join(docs_folder, "**", "*.txt"), recursive=True)
         if not docs or len(docs) < 1:
             error_message = (
                 f"Document source directory is empty: '{docs_folder}'. "
                 "Please add documents to this directory or specify a different one."
             )
-            structlogger.error(
-                "enterprise_search_policy.train.faiss.source_directory_empty",
-                message=error_message,
+            error_code = (
+                "core.policies.enterprise_search_policy.train"
+                ".faiss.source_directory_empty"
             )
-            print_error_and_exit(error_message)
+            raise EnterpriseSearchPolicyError(code=error_code, event_info=error_message)
 
     @classmethod
     def load(

rasa/dialogue_understanding/commands/correct_slots_command.py

@@ -269,6 +269,20 @@ class CorrectSlotsCommand(Command):
             return []
 
         structlogger.debug("correct_slots_command", command=self)
+
+        # check if the correct slot is referring to a slot of a flow on the stack
+        # the slot also needs to be part of a collect step in any of those flows
+        # if this is not the case, we don't want to correct the slot
+        for slot in self.corrected_slots:
+            if not self.should_correct_slot(slot, tracker, all_flows):
+                structlogger.warning(
+                    "correct_slots_command.skip_correct_slot",
+                    correct_slot=slot,
+                    reason="The slot is not part of a collect step in any of the flows "
+                    "on the stack. Skipping correction.",
+                )
+                return []
+
         proposed_slots = self.corrected_slots_dict(tracker)
 
         correction_frame = self.create_correction_frame(
@@ -293,3 +307,27 @@ class CorrectSlotsCommand(Command):
             return False
 
         return True
+
+    def should_correct_slot(
+        self, slot: CorrectedSlot, tracker: DialogueStateTracker, all_flows: FlowsList
+    ) -> bool:
+        """Checks if the slot should be corrected.
+
+        Args:
+            slot: The slot to check.
+            tracker: The tracker.
+            all_flows: All flows in the assistant.
+        """
+        # get all flows on the stack
+        flows_on_stack = utils.user_flows_on_the_stack(tracker.stack)
+
+        # check if the slot is part of a collect step in any of the flows on the stack
+        for flow_id in flows_on_stack:
+            flow = all_flows.flow_by_id(flow_id)
+            if flow is None:
+                continue
+            for collect_step in flow.get_collect_steps():
+                if collect_step.collect == slot.name:
+                    return True
+
+        return False

rasa/dialogue_understanding/generator/command_parser.py

@@ -1,5 +1,4 @@
 import re
-import sys
 from functools import lru_cache
 from typing import Any, Callable, Dict, List, Optional, Type, Union
 
@@ -19,6 +18,7 @@ from rasa.dialogue_understanding.commands import (
 )
 from rasa.dialogue_understanding.commands.prompt_command import PromptCommand
 from rasa.dialogue_understanding.commands.utils import start_flow_by_name
+from rasa.exceptions import ValidationError
 from rasa.shared.core.flows import FlowsList
 
 structlogger = structlog.get_logger()
@@ -87,16 +87,13 @@ def validate_custom_commands(command_classes: List[Type[PromptCommand]]) -> None
     ]
 
     if clz_not_inheriting_from_command_clz:
-        structlogger.error(
-            "command_parser.validate_custom_commands.invalid_command",
+        raise ValidationError(
+            code="command_parser.validate_custom_commands.invalid_command",
+            event_info="The additional command classes must be a subclass of the "
+            "'Command' class. Please refer to the class in "
+            "`rasa.dialogue_understanding.commands.command.Command`",
             invalid_commands=clz_not_inheriting_from_command_clz,
-            event_info=(
-                "The additional command classes must be a subclass of the 'Command' "
-                "class. Please refer to the class in "
-                "`rasa.dialogue_understanding.commands.command.Command`"
-            ),
         )
-        sys.exit(1)
 
     clz_not_adhering_to_prompt_command_protocol = [
         command_clz.__name__
@@ -105,16 +102,15 @@ def validate_custom_commands(command_classes: List[Type[PromptCommand]]) -> None
     ]
 
     if clz_not_adhering_to_prompt_command_protocol:
-        structlogger.error(
-            "command_parser.validate_custom_commands.invalid_command",
-            invalid_commands=clz_not_adhering_to_prompt_command_protocol,
+        raise ValidationError(
+            code="command_parser.validate_custom_commands.invalid_command",
             event_info=(
                 "The additional command classes must adhere to the 'PromptCommand' "
                 "protocol. Please refer to the protocol in "
                 "`rasa.dialogue_understanding.commands.prompt_command.PromptCommand`"
             ),
+            invalid_commands=clz_not_adhering_to_prompt_command_protocol,
         )
-        sys.exit(1)
 
 
 def parse_commands(

rasa/dialogue_understanding/processor/command_processor.py

@@ -37,7 +37,6 @@ from rasa.dialogue_understanding.stack.frames import (
     BaseFlowStackFrame,
 )
 from rasa.dialogue_understanding.stack.utils import (
-    filled_slots_for_active_flow,
     top_flow_frame,
     top_user_flow_frame,
 )
@@ -125,7 +124,8 @@ def validate_state_of_commands(commands: List[Command]) -> None:
     # check that there is only at max one cancel flow command
     if sum(isinstance(c, CancelFlowCommand) for c in commands) > 1:
         structlogger.error(
-            "command_processor.validate_state_of_commands.multiple_cancel_flow_commands",
+            "command_processor.validate_state_of_commands."
+            "multiple_cancel_flow_commands",
             commands=[command.__class__.__name__ for command in commands],
         )
         raise ValueError("There can only be one cancel flow command.")
@@ -136,7 +136,8 @@ def validate_state_of_commands(commands: List[Command]) -> None:
     ]
     if free_form_answer_commands != commands[: len(free_form_answer_commands)]:
         structlogger.error(
-            "command_processor.validate_state_of_commands.free_form_answer_commands_not_at_beginning",
+            "command_processor.validate_state_of_commands."
+            "free_form_answer_commands_not_at_beginning",
             commands=[command.__class__.__name__ for command in commands],
         )
         raise ValueError(
@@ -146,7 +147,8 @@ def validate_state_of_commands(commands: List[Command]) -> None:
     # check that there is at max only one correctslots command
     if sum(isinstance(c, CorrectSlotsCommand) for c in commands) > 1:
         structlogger.error(
-            "command_processor.validate_state_of_commands.multiple_correct_slots_commands",
+            "command_processor.validate_state_of_commands."
+            "multiple_correct_slots_commands",
             commands=[command.__class__.__name__ for command in commands],
         )
         raise ValueError("There can only be one correct slots command.")
@@ -230,11 +232,9 @@ def execute_commands(
 
     events: List[Event] = flow_hash_events
 
-    # commands need to be reversed to make sure they end up in the right order
-    # on the stack. e.g. if there multiple start flow commands, the first one
-    # should be on top of the stack. this is achieved by reversing the list
-    # and then pushing the commands onto the stack in the reversed order.
-    reversed_commands = list(reversed(commands))
+    # reorder commands: in case there is no active flow, we want to make sure to
+    # run the start flow commands first.
+    final_commands = reorder_commands(commands, tracker)
 
     # we need to keep track of the ValidateSlotPatternFlowStackFrame that
     # should be pushed onto the stack before executing the StartFlowCommands.
@@ -245,7 +245,7 @@ def execute_commands(
 
     validate_state_of_commands(commands)
 
-    for command in reversed_commands:
+    for command in final_commands:
         new_events = command.run_command_on_tracker(
             tracker, all_flows, original_tracker
         )
@@ -398,11 +398,11 @@ def clean_up_commands(
     """
     domain = domain if domain else Domain.empty()
 
-    slots_so_far, _ = filled_slots_for_active_flow(tracker, all_flows)
-
-    # update the slots so far with the slots that were set in the tracker
-    slots_so_far.update(
-        {event.key for event in tracker.events if isinstance(event, SlotSet)}
+    # 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] = []
@@ -444,7 +444,8 @@ def clean_up_commands(
                 # drop a start flow command if the starting flow is equal
                 # to the currently active flow
                 structlogger.debug(
-                    "command_processor.clean_up_commands.skip_command_flow_already_active",
+                    "command_processor.clean_up_commands."
+                    "skip_command_flow_already_active",
                     command=command,
                 )
                 continue
@@ -475,7 +476,8 @@ def clean_up_commands(
             clean_commands = clean_up_clarify_command(clean_commands, commands, command)
             if command not in clean_commands:
                 structlogger.debug(
-                    "command_processor.clean_up_commands.drop_clarify_given_other_commands",
+                    "command_processor.clean_up_commands."
+                    "drop_clarify_given_other_commands",
                     command=command,
                 )
         else:
@@ -577,10 +579,10 @@ def clean_up_slot_command(
         The cleaned up commands.
     """
     stack = tracker.stack
-
     resulting_commands = commands_so_far[:]
-
     slot = tracker.slots.get(command.name)
+
+    # if the slot is not in the domain, we cannot set it
     if slot is None:
         structlogger.debug(
             "command_processor.clean_up_slot_command.skip_command_slot_not_in_domain",
@@ -593,6 +595,7 @@ def clean_up_slot_command(
         )
         return resulting_commands
 
+    # check if the slot should be set by the command
     if not should_slot_be_set(slot, command, resulting_commands):
         structlogger.debug(
             "command_processor.clean_up_slot_command.skip_command.extractor_"
@@ -618,6 +621,7 @@ def clean_up_slot_command(
 
         return resulting_commands
 
+    # check if the slot can be corrected by the LLM
     if (
         slot.filled_by == SetSlotExtractor.NLU.value
         and command.extractor == SetSlotExtractor.LLM.value
@@ -646,49 +650,71 @@ def clean_up_slot_command(
             resulting_commands.append(command)
             return resulting_commands
 
-        if (slot := tracker.slots.get(command.name)) is not None and str(
-            slot.value
-        ) == str(command.value):
-            # the slot is already set, we don't need to set it again
-            structlogger.debug(
-                "command_processor.clean_up_slot_command.skip_command_slot_already_set",
-                command=command,
-            )
+        if should_slot_be_corrected(command, tracker, stack, all_flows):
+            # if the slot was already set before, we need to convert it into
+            # a correction
+            return convert_set_slot_to_correction(command, resulting_commands)
+        else:
             return resulting_commands
 
-        top = top_flow_frame(stack)
-        if isinstance(top, CorrectionPatternFlowStackFrame):
-            already_corrected_slots = top.corrected_slots
-        else:
-            already_corrected_slots = {}
+    resulting_commands.append(command)
+    return resulting_commands
 
-        if command.name in already_corrected_slots and str(
-            already_corrected_slots[command.name]
-        ) == str(command.value):
-            structlogger.debug(
-                "command_processor.clean_up_slot_command"
-                ".skip_command_slot_already_corrected",
-                command=command,
-            )
-            return resulting_commands
 
+def should_slot_be_corrected(
+    command: SetSlotCommand,
+    tracker: DialogueStateTracker,
+    stack: DialogueStack,
+    all_flows: FlowsList,
+) -> bool:
+    """Check if a slot should be corrected."""
+    if (slot := tracker.slots.get(command.name)) is not None and str(slot.value) == str(
+        command.value
+    ):
+        # the slot is already set to the same value, we don't need to set it again
         structlogger.debug(
-            "command_processor.clean_up_slot_command.convert_command_to_correction",
+            "command_processor.clean_up_slot_command.skip_command_slot_already_set",
             command=command,
         )
+        return False
 
-        # Group all corrections into one command
-        corrected_slot = CorrectedSlot(command.name, command.value, command.extractor)
-        for c in resulting_commands:
-            if isinstance(c, CorrectSlotsCommand):
-                c.corrected_slots.append(corrected_slot)
-                break
-        else:
-            resulting_commands.append(
-                CorrectSlotsCommand(corrected_slots=[corrected_slot])
-            )
+    top = top_flow_frame(stack)
+    if isinstance(top, CorrectionPatternFlowStackFrame):
+        already_corrected_slots = top.corrected_slots
     else:
-        resulting_commands.append(command)
+        already_corrected_slots = {}
+
+    if command.name in already_corrected_slots and str(
+        already_corrected_slots[command.name]
+    ) == str(command.value):
+        structlogger.debug(
+            "command_processor.clean_up_slot_command"
+            ".skip_command_slot_already_corrected",
+            command=command,
+        )
+        return False
+
+    return True
+
+
+def convert_set_slot_to_correction(
+    command: SetSlotCommand,
+    resulting_commands: List[Command],
+) -> List[Command]:
+    """Convert a set slot command to a correction command."""
+    structlogger.debug(
+        "command_processor.convert_set_slot_to_correction",
+        command=command,
+    )
+
+    # Group all corrections into one command
+    corrected_slot = CorrectedSlot(command.name, command.value, command.extractor)
+    for c in resulting_commands:
+        if isinstance(c, CorrectSlotsCommand):
+            c.corrected_slots.append(corrected_slot)
+            break
+    else:
+        resulting_commands.append(CorrectSlotsCommand(corrected_slots=[corrected_slot]))
 
     return resulting_commands
 
@@ -747,7 +773,8 @@ def clean_up_chitchat_command(
             0, CannotHandleCommand(RASA_PATTERN_CANNOT_HANDLE_CHITCHAT)
         )
         structlogger.warn(
-            "command_processor.clean_up_chitchat_command.replace_chitchat_answer_with_cannot_handle",
+            "command_processor.clean_up_chitchat_command."
+            "replace_chitchat_answer_with_cannot_handle",
             command=resulting_commands[0],  # no PII
             pattern_chitchat_uses_action_trigger_chitchat=has_action_trigger_chitchat,
             defined_intentless_policy_in_config=defines_intentless_policy,
@@ -850,3 +877,49 @@ def filter_cannot_handle_command(
         for command in clean_commands
         if not isinstance(command, CannotHandleCommand)
     ]
+
+
+def reorder_commands(
+    commands: List[Command], tracker: DialogueStateTracker
+) -> List[Command]:
+    """Reorder commands.
+
+    In case there is no active flow, we want to make sure to run the start flow
+    commands first.
+    """
+    reordered_commands = commands
+
+    top_flow_frame = top_user_flow_frame(tracker.stack)
+
+    if top_flow_frame is None:
+        # no active flow, we want to make sure to run the start flow commands first
+        start_flow_commands: List[Command] = [
+            command for command in commands if isinstance(command, StartFlowCommand)
+        ]
+
+        # if there are no start flow commands, we can return the commands as they are
+        if not start_flow_commands:
+            reordered_commands = commands
+
+        # if there is just one start flow command, we want to run it first
+        # as the order of commands is reserved later,
+        # we need to add it to the end of the list
+        elif len(start_flow_commands) == 1:
+            reordered_commands = [
+                command for command in commands if command not in start_flow_commands
+            ] + start_flow_commands
+
+        # if there are multiple start flow commands,
+        # we just make sure to move the first start flow command to the end of the list
+        # (due to the reverse execution order of commands) and keep the other commands
+        # as they are.
+        else:
+            reordered_commands = [
+                command for command in commands if command != start_flow_commands[-1]
+            ] + [start_flow_commands[-1]]
+
+    # commands need to be reversed to make sure they end up in the right order
+    # on the stack. e.g. if there multiple start flow commands, the first one
+    # should be on top of the stack. this is achieved by reversing the list
+    # and then pushing the commands onto the stack in the reversed order.
+    return list(reversed(reordered_commands))

rasa/dialogue_understanding/stack/utils.py

@@ -209,14 +209,24 @@ def get_collect_steps_excluding_ask_before_filling_for_active_flow(
         All collect steps that are part of the current active flow,
         excluding the collect steps that have to be asked before filling.
     """
-    active_frame = top_user_flow_frame(
+    active_primary_frame = top_user_flow_frame(dialogue_stack)
+    any_active_frame = top_user_flow_frame(
         dialogue_stack, ignore_call_and_link_frames=False
     )
-    if active_frame is None:
+
+    active_flows = []
+    if any_active_frame:
+        active_flows.append(any_active_frame.flow(all_flows))
+
+    if active_primary_frame and active_primary_frame != any_active_frame:
+        active_flows.append(active_primary_frame.flow(all_flows))
+
+    if not active_flows:
         return set()
-    active_flow = active_frame.flow(all_flows)
+
     return set(
         step.collect
+        for active_flow in active_flows
         for step in active_flow.get_collect_steps()
         if not step.ask_before_filling
     )

rasa/dialogue_understanding_test/validation.py

@@ -1,5 +1,4 @@
 import argparse
-import sys
 from typing import List, Optional
 
 import structlog
@@ -9,6 +8,7 @@ from rasa.dialogue_understanding_test.constants import (
     PLACEHOLDER_GENERATED_ANSWER_TEMPLATE,
 )
 from rasa.dialogue_understanding_test.du_test_case import DialogueUnderstandingTestCase
+from rasa.exceptions import ValidationError
 from rasa.shared.core.domain import Domain
 
 structlogger = structlog.get_logger()
@@ -28,14 +28,14 @@ def validate_cli_arguments(args: argparse.Namespace) -> None:
         args.remote_storage
         and args.remote_storage.lower() not in supported_remote_storages
     ):
-        structlogger.error(
-            "dialogue_understanding_test.validate_cli_arguments.invalid_remote_storage",
+        raise ValidationError(
+            code="dialogue_understanding_test.validate_cli_arguments"
+            ".invalid_remote_storage",
             event_info=(
                 f"Invalid remote storage option - '{args.remote_storage}'. Supported "
                 f"options are: {supported_remote_storages}"
             ),
         )
-        sys.exit(1)
 
 
 def validate_test_cases(
@@ -48,11 +48,10 @@ def validate_test_cases(
         domain: Domain of the assistant.
     """
     if not domain:
-        structlogger.error(
-            "dialogue_understanding_test.validate_test_cases.no_domain",
+        raise ValidationError(
+            code="dialogue_understanding_test.validate_test_cases.no_domain",
             event_info="No domain found. Retrain the model with a valid domain.",
         )
-        sys.exit(1)
 
     # Retrieve all valid templates from the domain
     valid_templates = domain.utterances_for_response
@@ -64,8 +63,9 @@ def validate_test_cases(
         for step in test_case.steps:
             if step.actor == ACTOR_BOT and step.template:
                 if step.template not in valid_templates:
-                    structlogger.error(
-                        "dialogue_understanding_test.validate_test_cases.invalid_template",
+                    raise ValidationError(
+                        code="dialogue_understanding_test.validate_test_cases"
+                        ".invalid_template",
                         event_info=(
                             f"Invalid bot utterance template '{step.template}' in test "
                             f"case '{test_case.name}' at line {step.line}. Please "
@@ -74,4 +74,3 @@ def validate_test_cases(
                         test_case=test_case.name,
                         template=step.template,
                     )
-                    sys.exit(1)

rasa/e2e_test/e2e_config.py

@@ -67,26 +67,33 @@ class LLMJudgeConfig(BaseModel):
     @classmethod
     def from_dict(cls, config_data: Dict[str, Any]) -> LLMJudgeConfig:
         """Loads the configuration from a dictionary."""
-        embeddings = config_data.pop(EMBEDDINGS_CONFIG_KEY, None)
+        embeddings = config_data.pop(EMBEDDINGS_CONFIG_KEY, {})
         llm_config = config_data.pop("llm", {})
 
         llm_config = resolve_model_client_config(llm_config)
-        llm_config, extra_parameters = cls.extract_attributes(llm_config)
+        llm_config, llm_extra_parameters = cls.extract_attributes(llm_config)
         llm_config = combine_custom_and_default_config(
             llm_config, cls.get_default_llm_config()
         )
         embeddings_config = resolve_model_client_config(embeddings)
+        embeddings_config, embeddings_extra_parameters = cls.extract_attributes(
+            embeddings_config
+        )
 
         return LLMJudgeConfig(
-            llm_config=BaseModelConfig(extra_parameters=extra_parameters, **llm_config),
-            embeddings=BaseModelConfig(**embeddings_config)
+            llm_config=BaseModelConfig(
+                extra_parameters=llm_extra_parameters, **llm_config
+            ),
+            embeddings=BaseModelConfig(
+                extra_parameters=embeddings_extra_parameters, **embeddings_config
+            )
             if embeddings_config
             else None,
         )
 
     @classmethod
     def extract_attributes(
-        cls, llm_config: Dict[str, Any]
+        cls, config: Dict[str, Any]
     ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
         """Extract the expected fields from the configuration."""
         required_config = {}
@@ -96,22 +103,22 @@ class LLMJudgeConfig(BaseModel):
             MODEL_CONFIG_KEY,
         ]
 
-        if PROVIDER_CONFIG_KEY in llm_config:
+        if PROVIDER_CONFIG_KEY in config:
             required_config = {
-                expected_field: llm_config.pop(expected_field, None)
+                expected_field: config.pop(expected_field, None)
                 for expected_field in expected_fields
             }
 
-        elif MODELS_CONFIG_KEY in llm_config:
-            llm_config = llm_config.pop(MODELS_CONFIG_KEY)[0]
+        elif MODELS_CONFIG_KEY in config:
+            config = config.pop(MODELS_CONFIG_KEY)[0]
 
             required_config = {
-                expected_field: llm_config.pop(expected_field, None)
+                expected_field: config.pop(expected_field, None)
                 for expected_field in expected_fields
             }
 
         clean_config = clean_up_config(required_config)
-        return clean_config, llm_config
+        return clean_config, config
 
     @property
     def llm_config_as_dict(self) -> Dict[str, Any]: