rasa-pro 3.10.16__py3-none-any.whl → 3.11.0a1__py3-none-any.whl

rasa/dialogue_understanding/commands/change_flow_command.py

@@ -36,9 +36,3 @@ class ChangeFlowCommand(Command):
         # the change flow command is not actually pushing anything to the tracker,
         # but it is predicted by the MultiStepLLMCommandGenerator and used internally
         return []
-
-    def __eq__(self, other: Any) -> bool:
-        return isinstance(other, ChangeFlowCommand)
-
-    def __hash__(self) -> int:
-        return hash(self.command())

rasa/dialogue_understanding/commands/session_end_command.py

@@ -0,0 +1,61 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Dict, List
+from rasa.dialogue_understanding.commands import Command
+from rasa.shared.core.events import Event, SessionEnded
+from rasa.shared.core.flows import FlowsList
+from rasa.shared.core.trackers import DialogueStateTracker
+
+
+@dataclass
+class SessionEndCommand(Command):
+    """A command to indicate the end of a session."""
+
+    @classmethod
+    def command(cls) -> str:
+        """Returns the command type."""
+        return "session end"
+
+    @classmethod
+    def from_dict(cls, data: Dict[str, Any]) -> SessionEndCommand:
+        """Converts the dictionary to a command.
+
+        Returns:
+            The converted dictionary.
+        """
+        return SessionEndCommand()
+
+    def run_command_on_tracker(
+        self,
+        tracker: DialogueStateTracker,
+        all_flows: FlowsList,
+        original_tracker: DialogueStateTracker,
+    ) -> List[Event]:
+        """Runs the command on the tracker.
+
+        Args:
+            tracker: The tracker to run the command on.
+            all_flows: All flows in the assistant.
+            original_tracker: The tracker before any command was executed.
+
+        Returns:
+            The events to apply to the tracker.
+        """
+        metadata = {"_reason": "user disconnected"}
+
+        # Add metadata sent by the channel connector, if available
+        if tracker.latest_message:
+            user_metadata = tracker.latest_message.metadata or {}
+            metadata.update(user_metadata)
+
+        return [SessionEnded(metadata=metadata)]
+
+    def __hash__(self) -> int:
+        return hash(self.command())
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, SessionEndCommand):
+            return False
+
+        return True

rasa/dialogue_understanding/generator/flow_retrieval.py

@@ -50,7 +50,6 @@ from rasa.shared.utils.llm import (
     USER,
     get_prompt_template,
     allowed_values_for_slot,
-    try_instantiate_embedder,
 )
 
 DEFAULT_FLOW_DOCUMENT_TEMPLATE = importlib.resources.read_text(
@@ -143,12 +142,6 @@ class FlowRetrieval:
         """Load flow retrieval with previously populated FAISS vector store."""
         # initialize base flow retrieval
         flow_retrieval = FlowRetrieval(config, model_storage, resource)
-        try_instantiate_embedder(
-            flow_retrieval.config.get(EMBEDDINGS_CONFIG_KEY),
-            DEFAULT_EMBEDDINGS_CONFIG,
-            "flow_retrieval.load",
-            FlowRetrieval.__name__,
-        )
         # load vector store
         vector_store = cls._load_vector_store(
             flow_retrieval.config, model_storage, resource

rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -2,6 +2,7 @@ from abc import ABC, abstractmethod
 from functools import lru_cache
 from typing import Dict, Any, List, Optional, Tuple, Union, Text
 
+import os
 import structlog
 from jinja2 import Template
 
@@ -22,6 +23,7 @@ from rasa.engine.graph import GraphComponent, 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.shared.constants import LLM_API_HEALTH_CHECK_ENV_VAR
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.flows import FlowStep, Flow, FlowsList
 from rasa.shared.core.flows.steps.collect import CollectInformationFlowStep
@@ -33,6 +35,7 @@ from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.nlu.training_data.training_data import TrainingData
 from rasa.shared.utils.llm import (
     allowed_values_for_slot,
+    llm_api_health_check,
     llm_factory,
     try_instantiate_llm_client,
 )
@@ -169,12 +172,18 @@ class LLMBasedCommandGenerator(GraphComponent, CommandGenerator, ABC):
         store.
         """
         # Validate llm configuration
-        try_instantiate_llm_client(
+        llm_client = try_instantiate_llm_client(
             self.config.get(LLM_CONFIG_KEY),
             DEFAULT_LLM_CONFIG,
             "llm_based_command_generator.train",
-            "LLMBasedCommandGenerator",
+            LLMBasedCommandGenerator.__name__,
         )
+        if os.getenv(LLM_API_HEALTH_CHECK_ENV_VAR, "true").lower() == "true":
+            llm_api_health_check(
+                llm_client,
+                "llm_based_command_generator.train",
+                LLMBasedCommandGenerator.__name__,
+            )
 
         # flow retrieval is populated with only user-defined flows
         try:
@@ -183,7 +192,7 @@ class LLMBasedCommandGenerator(GraphComponent, CommandGenerator, ABC):
         except Exception as e:
             structlogger.error(
                 "llm_based_command_generator.train.failed",
-                event_info="Flow retrieval store is inaccessible.",
+                event_info=("Flow retrieval store isinaccessible."),
                 error=e,
             )
             raise

rasa/dialogue_understanding/generator/llm_command_generator.py

@@ -1,4 +1,4 @@
-from typing import Dict, Any, Optional, Text
+from typing import Any, Dict, Optional, Text
 
 import structlog
 from deprecated import deprecated  # type: ignore[import]

rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py

@@ -24,7 +24,6 @@ from rasa.dialogue_understanding.generator.constants import (
     LLM_CONFIG_KEY,
     USER_INPUT_CONFIG_KEY,
     FLOW_RETRIEVAL_KEY,
-    DEFAULT_LLM_CONFIG,
 )
 from rasa.dialogue_understanding.generator.flow_retrieval import FlowRetrieval
 from rasa.dialogue_understanding.generator.llm_based_command_generator import (
@@ -54,7 +53,6 @@ from rasa.shared.utils.llm import (
     tracker_as_readable_transcript,
     sanitize_message_for_prompt,
     allowed_values_for_slot,
-    try_instantiate_llm_client,
 )
 
 # multistep template keys
@@ -143,12 +141,6 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
         prompts = cls._load_prompt_templates(model_storage, resource)
         # init base command generator
         command_generator = cls(config, model_storage, resource, prompts)
-        try_instantiate_llm_client(
-            command_generator.config.get(LLM_CONFIG_KEY),
-            DEFAULT_LLM_CONFIG,
-            "multi_step_llm_command_generator.load",
-            MultiStepLLMCommandGenerator.__name__,
-        )
         # load flow retrieval if enabled
         if command_generator.enabled_flow_retrieval:
             command_generator.flow_retrieval = cls.load_flow_retrival(
@@ -237,9 +229,9 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
         commands: List[Command] = []
 
         slot_set_re = re.compile(
-            r"""SetSlot\(['"]?([a-zA-Z_][a-zA-Z0-9_-]*)['"]?, ?['"]?(.*)['"]?\)"""
+            r"""SetSlot\((\"?[a-zA-Z_][a-zA-Z0-9_-]*?\"?), ?(.*)\)"""
         )
-        start_flow_re = re.compile(r"StartFlow\(['\"]?([a-zA-Z0-9_-]+)['\"]?\)")
+        start_flow_re = re.compile(r"StartFlow\(([a-zA-Z0-9_-]+?)\)")
         change_flow_re = re.compile(r"ChangeFlow\(\)")
         cancel_flow_re = re.compile(r"CancelFlow\(\)")
         chitchat_re = re.compile(r"ChitChat\(\)")
@@ -288,19 +280,9 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
                 commands.append(HumanHandoffCommand())
             elif match := clarify_re.search(action):
                 options = sorted([opt.strip() for opt in match.group(1).split(",")])
-                # Remove surrounding quotes if present
-                cleaned_options = []
-                for flow in options:
-                    if (flow.startswith('"') and flow.endswith('"')) or (
-                        flow.startswith("'") and flow.endswith("'")
-                    ):
-                        cleaned_options.append(flow[1:-1])
-                    else:
-                        cleaned_options.append(flow)
-                # check if flow is valid
                 valid_options = [
                     flow
-                    for flow in cleaned_options
+                    for flow in options
                     if flow in flows.user_flow_ids
                     and flow not in user_flows_on_the_stack(tracker.stack)
                 ]
@@ -311,13 +293,6 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             elif change_flow_re.search(action):
                 commands.append(ChangeFlowCommand())
 
-        if not commands:
-            structlogger.debug(
-                "multi_step_llm_command_generator.parse_commands",
-                message="No commands were parsed from the LLM actions.",
-                actions=actions,
-            )
-
         return commands
 
     ### Helper methods

rasa/dialogue_understanding/generator/nlu_command_adapter.py

@@ -19,7 +19,6 @@ from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.constants import ROUTE_TO_CALM_SLOT
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.flows.flows_list import FlowsList
-from rasa.shared.core.flows.steps import CollectInformationFlowStep
 from rasa.shared.core.slot_mappings import (
     SlotFillingManager,
     extract_slot_value,
@@ -218,24 +217,7 @@ def _issue_set_slot_commands(
     commands: List[Command] = []
     domain = domain if domain else Domain.empty()
     slot_filling_manager = SlotFillingManager(domain, tracker, message)
-
-    # only use slots that don't have ask_before_filling set to True
-    available_slot_names = flows.available_slot_names(ask_before_filling=False)
-
-    # check if the current step is a CollectInformationFlowStep
-    # in case it has ask_before_filling set to True, we need to add the
-    # slot to the available_slot_names
-    if tracker.active_flow:
-        flow = flows.flow_by_id(tracker.active_flow)
-        step_id = tracker.current_step_id
-        if flow is not None:
-            current_step = flow.step_by_id(step_id)
-            if (
-                current_step
-                and isinstance(current_step, CollectInformationFlowStep)
-                and current_step.ask_before_filling
-            ):
-                available_slot_names.add(current_step.collect)
+    available_slot_names = flows.available_slot_names()
 
     for _, slot in tracker.slots.items():
         # if a slot is not collected in available flows,

rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py

@@ -21,7 +21,6 @@ from rasa.dialogue_understanding.generator.constants import (
     LLM_CONFIG_KEY,
     USER_INPUT_CONFIG_KEY,
     FLOW_RETRIEVAL_KEY,
-    DEFAULT_LLM_CONFIG,
 )
 from rasa.dialogue_understanding.generator.flow_retrieval import (
     FlowRetrieval,
@@ -49,7 +48,6 @@ from rasa.shared.utils.llm import (
     get_prompt_template,
     tracker_as_readable_transcript,
     sanitize_message_for_prompt,
-    try_instantiate_llm_client,
 )
 from rasa.utils.log_utils import log_llm
 
@@ -138,12 +136,6 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
         )
         # init base command generator
         command_generator = cls(config, model_storage, resource, prompt_template)
-        try_instantiate_llm_client(
-            command_generator.config.get(LLM_CONFIG_KEY),
-            DEFAULT_LLM_CONFIG,
-            "single_step_llm_command_generator.load",
-            SingleStepLLMCommandGenerator.__name__,
-        )
         # load flow retrieval if enabled
         if command_generator.enabled_flow_retrieval:
             command_generator.flow_retrieval = cls.load_flow_retrival(
@@ -193,12 +185,6 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
 
         if not commands:
             # no commands are parsed or there's an invalid command
-            structlogger.warning(
-                "single_step_llm_command_generator.predict_commands",
-                message="No commands were predicted as the LLM response could "
-                "not be parsed or the LLM responded with an invalid command."
-                "Returning a CannotHandleCommand instead.",
-            )
             commands = [CannotHandleCommand()]
 
         if tracker.has_coexistence_routing_slot:
@@ -299,16 +285,14 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
 
         commands: List[Command] = []
 
-        slot_set_re = re.compile(
-            r"""SetSlot\(['"]?([a-zA-Z_][a-zA-Z0-9_-]*)['"]?, ?['"]?(.*)['"]?\)"""
-        )
-        start_flow_re = re.compile(r"StartFlow\(['\"]?([a-zA-Z0-9_-]+)['\"]?\)")
+        slot_set_re = re.compile(r"""SetSlot\(([a-zA-Z_][a-zA-Z0-9_-]*?), ?(.*)\)""")
+        start_flow_re = re.compile(r"StartFlow\(([a-zA-Z0-9_-]+?)\)")
         cancel_flow_re = re.compile(r"CancelFlow\(\)")
         chitchat_re = re.compile(r"ChitChat\(\)")
         skip_question_re = re.compile(r"SkipQuestion\(\)")
         knowledge_re = re.compile(r"SearchAndReply\(\)")
         humand_handoff_re = re.compile(r"HumanHandoff\(\)")
-        clarify_re = re.compile(r"Clarify\(([\"\'a-zA-Z0-9_, ]+)\)")
+        clarify_re = re.compile(r"Clarify\(([a-zA-Z0-9_, ]+)\)")
 
         for action in actions.strip().splitlines():
             if match := slot_set_re.search(action):
@@ -337,31 +321,14 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
                 commands.append(HumanHandoffCommand())
             elif match := clarify_re.search(action):
                 options = sorted([opt.strip() for opt in match.group(1).split(",")])
-                # Remove surrounding quotes if present
-                cleaned_options = []
-                for flow in options:
-                    if (flow.startswith('"') and flow.endswith('"')) or (
-                        flow.startswith("'") and flow.endswith("'")
-                    ):
-                        cleaned_options.append(flow[1:-1])
-                    else:
-                        cleaned_options.append(flow)
-                # check if flow is valid
                 valid_options = [
-                    flow for flow in cleaned_options if flow in flows.user_flow_ids
+                    flow for flow in options if flow in flows.user_flow_ids
                 ]
                 if len(set(valid_options)) == 1:
                     commands.extend(cls.start_flow_by_name(valid_options[0], flows))
                 elif len(valid_options) > 1:
                     commands.append(ClarifyCommand(valid_options))
 
-        if not commands:
-            structlogger.debug(
-                "single_step_llm_command_generator.parse_commands",
-                message="No commands were parsed from the LLM actions.",
-                actions=actions,
-            )
-
         return commands
 
     @classmethod

rasa/e2e_test/aggregate_test_stats_calculator.py

@@ -35,7 +35,6 @@ class AggregateTestStatsCalculator:
         self.test_cases = test_cases
 
         self.failed_assertion_set: Set["Assertion"] = set()
-        self.failed_test_cases_without_assertion_failure: Set[str] = set()
         self.passed_count_mapping = {
             subclass_type: 0
             for subclass_type in _get_all_assertion_subclasses().keys()
@@ -90,14 +89,8 @@ class AggregateTestStatsCalculator:
         passed_test_case_names = [
             passed.test_case.name for passed in self.passed_results
         ]
-        # We filter out test cases that failed without an assertion failure
-        filtered_test_cases = [
-            test_case
-            for test_case in self.test_cases
-            if test_case.name not in self.failed_test_cases_without_assertion_failure
-        ]
 
-        for test_case in filtered_test_cases:
+        for test_case in self.test_cases:
             if test_case.name in passed_test_case_names:
                 for step in test_case.steps:
                     if step.assertions is None:
@@ -125,9 +118,6 @@ class AggregateTestStatsCalculator:
                     "no_assertion_failure_in_failed_result",
                     test_case=failed.test_case.name,
                 )
-                self.failed_test_cases_without_assertion_failure.add(
-                    failed.test_case.name
-                )
                 continue
 
             self.failed_assertion_set.add(failed.assertion_failure.assertion)

rasa/e2e_test/assertions.py

@@ -452,11 +452,6 @@ class ActionExecutedAssertion(Assertion):
         **kwargs: Any,
     ) -> Tuple[Optional[AssertionFailure], Optional[Event]]:
         """Run the action executed assertion on the given events for that user turn."""
-        step_index = kwargs.get("step_index")
-        original_turn_events, turn_events = _get_turn_events_based_on_step_index(
-            step_index, turn_events, prior_events
-        )
-
         try:
             matching_event = next(
                 event
@@ -469,7 +464,7 @@ class ActionExecutedAssertion(Assertion):
             error_message += assertion_order_error_message
 
             return self._generate_assertion_failure(
-                error_message, prior_events, original_turn_events, self.line
+                error_message, prior_events, turn_events, self.line
             )
 
         return None, matching_event
@@ -524,11 +519,6 @@ class SlotWasSetAssertion(Assertion):
         """Run the slot_was_set assertion on the given events for that user turn."""
         matching_event = None
 
-        step_index = kwargs.get("step_index")
-        original_turn_events, turn_events = _get_turn_events_based_on_step_index(
-            step_index, turn_events, prior_events
-        )
-
         for slot in self.slots:
             matching_events = [
                 event
@@ -567,7 +557,7 @@ class SlotWasSetAssertion(Assertion):
                 error_message += assertion_order_error_message
 
                 return self._generate_assertion_failure(
-                    error_message, prior_events, original_turn_events, slot.line
+                    error_message, prior_events, turn_events, slot.line
                 )
 
         return None, matching_event
@@ -605,11 +595,6 @@ class SlotWasNotSetAssertion(Assertion):
         """Run the slot_was_not_set assertion on the given events for that user turn."""
         matching_event = None
 
-        step_index = kwargs.get("step_index")
-        original_turn_events, turn_events = _get_turn_events_based_on_step_index(
-            step_index, turn_events, prior_events
-        )
-
         for slot in self.slots:
             matching_events = [
                 event
@@ -645,7 +630,7 @@ class SlotWasNotSetAssertion(Assertion):
                 error_message += assertion_order_error_message
 
                 return self._generate_assertion_failure(
-                    error_message, prior_events, original_turn_events, slot.line
+                    error_message, prior_events, turn_events, slot.line
                 )
 
         return None, matching_event
@@ -738,11 +723,6 @@ class BotUtteredAssertion(Assertion):
         """Run the bot_uttered assertion on the given events for that user turn."""
         matching_event = None
 
-        step_index = kwargs.get("step_index")
-        original_turn_events, turn_events = _get_turn_events_based_on_step_index(
-            step_index, turn_events, prior_events
-        )
-
         if self.utter_name is not None:
             try:
                 matching_event = next(
@@ -756,7 +736,7 @@ class BotUtteredAssertion(Assertion):
                 error_message += assertion_order_error_message
 
                 return self._generate_assertion_failure(
-                    error_message, prior_events, original_turn_events, self.line
+                    error_message, prior_events, turn_events, self.line
                 )
 
         if self.text_matches is not None:
@@ -776,7 +756,7 @@ class BotUtteredAssertion(Assertion):
                 error_message += assertion_order_error_message
 
                 return self._generate_assertion_failure(
-                    error_message, prior_events, original_turn_events, self.line
+                    error_message, prior_events, turn_events, self.line
                 )
 
         if self.buttons:
@@ -792,7 +772,7 @@ class BotUtteredAssertion(Assertion):
                 )
                 error_message += assertion_order_error_message
                 return self._generate_assertion_failure(
-                    error_message, prior_events, original_turn_events, self.line
+                    error_message, prior_events, turn_events, self.line
                 )
 
         return None, matching_event
@@ -1199,25 +1179,3 @@ def _find_matching_generative_events(turn_events: List[Event]) -> List[BotUttere
         and event.metadata.get(UTTER_SOURCE_METADATA_KEY)
         in ELIGIBLE_UTTER_SOURCE_METADATA
     ]
-
-
-def _get_turn_events_based_on_step_index(
-    step_index: int, turn_events: List[Event], prior_events: List[Event]
-) -> Tuple[List[Event], List[Event]]:
-    """Get the turn events based on the step index.
-
-    For the first step, we need to include the prior events as well
-    in the same user turn. For the subsequent steps, we only need the
-    events that follow the user uttered event on which the tracker
-    was originally sliced by.
-
-    Returns:
-        List[Event]: The copy of turn_events
-        List[Event]: The turn events based on the step index
-
-    """
-    original_turn_events = turn_events[:]
-    if step_index == 0:
-        return original_turn_events, prior_events + turn_events
-
-    return original_turn_events, turn_events

rasa/e2e_test/e2e_test_runner.py

@@ -16,6 +16,7 @@ import rasa.shared.utils.io
 from rasa.core.channels import CollectingOutputChannel, UserMessage
 from rasa.core.constants import ACTIVE_FLOW_METADATA_KEY, STEP_ID_METADATA_KEY
 from rasa.core.exceptions import AgentNotReady
+from rasa.core.persistor import StorageType
 from rasa.core.utils import AvailableEndpoints
 from rasa.e2e_test.constants import TEST_CASE_NAME, TEST_FILE_NAME
 from rasa.e2e_test.e2e_config import create_llm_judge_config
@@ -34,7 +35,6 @@ from rasa.e2e_test.e2e_test_result import (
     TestResult,
 )
 from rasa.llm_fine_tuning.conversations import Conversation
-from rasa.nlu.persistor import StorageType
 from rasa.shared.constants import RASA_DEFAULT_FLOW_PATTERN_PREFIX
 from rasa.shared.core.events import (
     ActionExecuted,
@@ -136,7 +136,7 @@ class E2ETestRunner:
             return turns
 
         tracker = await self.agent.processor.fetch_tracker_with_initial_session(
-            sender_id, output_channel=collector
+            sender_id
         )
         # turn -1 i used to contain events that happen during
         # the start of the session and before the first user message
@@ -190,11 +190,11 @@ class E2ETestRunner:
                     error=f"Message handling timed out for user message '{step.text}'.",
                     exc_info=True,
                 )
-            except Exception as exc:
+            except Exception:
                 structlogger.error(
                     "e2e_test_runner.run_prediction_loop",
                     error=f"An exception occurred while handling "
-                    f"user message '{step.text}'. Error: {exc}",
+                    f"user message '{step.text}'.",
                 )
             tracker = await self.agent.tracker_store.retrieve(sender_id)  # type: ignore[assignment]
             turns[position], event_cursor = self.get_actual_step_output(
@@ -442,7 +442,7 @@ class E2ETestRunner:
         assertion_failure_found = False
         input_metadata = input_metadata if input_metadata else []
 
-        for index, step in enumerate(test_case.steps):
+        for step in test_case.steps:
             if not step.assertions:
                 structlogger.debug(
                     "e2e_test_runner.run_assertions.no_assertions.skipping_step",
@@ -490,7 +490,6 @@ class E2ETestRunner:
                     assertion_order_error_message=assertion_order_error_msg,
                     llm_judge_config=self.llm_judge_config,
                     step_text=step.text,
-                    step_index=index,
                 )
 
                 if assertion_failure:
@@ -827,7 +826,7 @@ class E2ETestRunner:
             return
 
         tracker = await self.agent.processor.fetch_tracker_with_initial_session(
-            sender_id, output_channel=CollectingOutputChannel()
+            sender_id
         )
 
         for fixture in fixtures:
@@ -1156,8 +1155,6 @@ class E2ETestRunner:
                     flow_paths_stack
                     and self.agent.domain
                     and self.agent.domain.is_custom_action(event.action_name)
-                    and STEP_ID_METADATA_KEY in event.metadata
-                    and ACTIVE_FLOW_METADATA_KEY in event.metadata
                 ):
                     flow_paths_stack[-1].nodes.append(self._create_path_node(event))
 

rasa/e2e_test/utils/e2e_yaml_utils.py

@@ -45,7 +45,7 @@ class E2ETestYAMLWriter:
 
         yaml_data = ruamel.yaml.safe_load(tests)
 
-        test_cases_yaml = {KEY_TEST_CASES: yaml_data}
+        test_cases_yaml = [{KEY_TEST_CASES: yaml_data}]
         with open(output_file, "w") as outfile:
             yaml = ruamel.yaml.YAML()
             yaml.dump(test_cases_yaml, outfile)

rasa/e2e_test/utils/io.py

@@ -346,7 +346,7 @@ def read_test_cases(path: str) -> TestSuite:
     beta_flag_verified = False
 
     for test_file in test_files:
-        test_file_content = parse_raw_yaml(Path(test_file).read_text(encoding="utf-8"))
+        test_file_content = parse_raw_yaml(Path(test_file).read_text())
 
         validate_yaml_data_using_schema_with_assertions(
             yaml_data=test_file_content, schema_content=e2e_test_schema
@@ -506,8 +506,6 @@ def transform_results_output_to_yaml(yaml_string: str) -> str:
             result.append(s)
         elif s.startswith("\n"):
             result.append(s.strip())
-        elif s.strip().startswith("#"):
-            continue
         else:
             result.append(s)
     return "".join(result)

rasa/engine/graph.py

@@ -67,14 +67,6 @@ class SchemaNode:
     is_input: bool = False
     resource: Optional[Resource] = None
 
-    def matches_type(self, node_type: Type, include_subtypes: bool = True) -> bool:
-        """Checks if schema node's 'uses' is of specified node type.
-        By default, it also checks for subtypes of the specified node type.
-        """
-        return (self.uses is node_type) or (
-            include_subtypes and issubclass(self.uses, node_type)
-        )
-
 
 @dataclass
 class GraphSchema:
@@ -174,7 +166,9 @@ class GraphSchema:
         By default, it also checks for subtypes of the specified node type.
         """
         for node in self.nodes.values():
-            if node.matches_type(node_type, include_subtypes):
+            if (node.uses is node_type) or (
+                include_subtypes and issubclass(node.uses, node_type)
+            ):
                 return True
         return False
 
@@ -640,4 +634,3 @@ class GraphModelConfiguration:
     language: Optional[Text]
     core_target: Optional[Text]
     nlu_target: Optional[Text]
-    spaces: Optional[Dict[Text, Text]] = None

rasa/engine/recipes/config_files/default_config.yml

@@ -35,9 +35,6 @@ pipeline:
 policies:
   - name: MemoizationPolicy
   - name: RulePolicy
-  - name: UnexpecTEDIntentPolicy
-    max_history: 5
-    epochs: 100
   - name: TEDPolicy
     max_history: 5
     epochs: 100

rasa/engine/recipes/default_recipe.py

@@ -233,7 +233,6 @@ class DefaultV1Recipe(Recipe):
             training_type=training_type,
             assistant_id=config.get(ASSISTANT_ID_KEY),
             language=config.get("language"),
-            spaces=config.get("spaces"),
             core_target=core_target,
             nlu_target=f"run_{RegexMessageHandler.__name__}",
         )