rasa-pro 3.11.3a1.dev6__py3-none-any.whl → 3.11.4__py3-none-any.whl

rasa/dialogue_understanding/generator/command_generator.py

@@ -10,27 +10,18 @@ from rasa.dialogue_understanding.commands import (
     ErrorCommand,
 )
 from rasa.dialogue_understanding.commands.set_slot_command import SetSlotExtractor
-from rasa.shared.constants import (
-    RASA_PATTERN_INTERNAL_ERROR_USER_INPUT_TOO_LONG,
-    RASA_PATTERN_INTERNAL_ERROR_USER_INPUT_EMPTY,
-)
 from rasa.shared.core.constants import SlotMappingType
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.slot_mappings import SlotFillingManager
 from rasa.shared.core.trackers import DialogueStateTracker
-from rasa.shared.nlu.constants import (
-    COMMANDS,
-    TEXT,
-    PREDICTED_COMMANDS,
-    PROMPTS,
-    KEY_USER_PROMPT,
-    KEY_SYSTEM_PROMPT,
-    KEY_LLM_RESPONSE_METADATA,
-)
 from rasa.shared.nlu.training_data.message import Message
-from rasa.shared.providers.llm.llm_response import LLMResponse
+from rasa.shared.nlu.constants import COMMANDS, TEXT
 from rasa.shared.utils.llm import DEFAULT_MAX_USER_INPUT_CHARACTERS
+from rasa.shared.constants import (
+    RASA_PATTERN_INTERNAL_ERROR_USER_INPUT_TOO_LONG,
+    RASA_PATTERN_INTERNAL_ERROR_USER_INPUT_EMPTY,
+)
 
 structlogger = structlog.get_logger()
 
@@ -202,7 +193,6 @@ class CommandGenerator:
             flows: The flows to use for command prediction.
             tracker: The tracker containing the conversation history up to now.
             **kwargs: Keyword arguments for forward compatibility.
-
         Returns:
         The predicted commands.
         """
@@ -351,124 +341,3 @@ class CommandGenerator:
         ]
 
         return filtered_commands
-
-    @staticmethod
-    def _add_commands_to_message_parse_data(
-        message: Message, component_name: str, commands: List[Command]
-    ) -> None:
-        """Add commands to the message parse data.
-
-        Commands are only added in case the flag 'record_commands_and_prompts' is set.
-        Example of predicted commands in the message parse data:
-            Message(data={
-              PREDICTED_COMMANDS: {
-                "MultiStepLLMCommandGenerator": [
-                    {"command": "set_slot", "name": "slot_name", "value": "slot_value"},
-                ],
-                "NLUCommandAdapter": [
-                    {"command": "start_flow", "name": "test_flow"},
-                ]
-              }
-            })
-        """
-        from rasa.dialogue_understanding.utils import record_commands_and_prompts
-
-        # only set commands if the flag "record_commands_and_prompts" is set to True
-        if not record_commands_and_prompts:
-            return
-
-        commands_as_dict = [command.as_dict() for command in commands]
-
-        if message.get(PREDICTED_COMMANDS) is not None:
-            predicted_commands = message.get(PREDICTED_COMMANDS)
-            if component_name in predicted_commands:
-                predicted_commands[component_name].extend(commands_as_dict)
-            else:
-                predicted_commands[component_name] = commands_as_dict
-        else:
-            predicted_commands = {component_name: commands_as_dict}
-
-        message.set(
-            PREDICTED_COMMANDS,
-            predicted_commands,
-            add_to_output=True,
-        )
-
-    @staticmethod
-    def _add_prompt_to_message_parse_data(
-        message: Message,
-        component_name: str,
-        prompt_name: str,
-        user_prompt: str,
-        system_prompt: Optional[str] = None,
-        llm_response: Optional[LLMResponse] = None,
-    ) -> None:
-        """Add prompt to the message parse data.
-
-        Prompt is only added in case the flag 'record_commands_and_prompts' is set.
-        Example of prompts in the message parse data:
-            Message(data={
-              PROMPTS: {
-                "MultiStepLLMCommandGenerator": [
-                    (
-                        "fill_slots_prompt",
-                        {
-                            "user_prompt": <prompt content>",
-                            "system_prompt": <prompt content>",
-                            "llm_response_metadata": <metadata dict from LLMResponse>
-                        }
-                    ),
-                    (
-                        "handle_flows_prompt",
-                        {
-                            "user_prompt": <prompt content>",
-                            "system_prompt": <prompt content>",
-                            "llm_response_metadata": <metadata dict from LLMResponse>
-                        }
-                    ),
-                ],
-                "SingleStepLLMCommandGenerator": [
-                    (
-                        "prompt_template",
-                        {
-                            "user_prompt": <prompt content>",
-                            "system_prompt": <prompt content>",
-                            "llm_response_metadata": <metadata dict from LLMResponse>
-                        }
-                    ),
-                ]
-              }
-            })
-        """
-        from rasa.dialogue_understanding.utils import record_commands_and_prompts
-
-        # only set prompt if the flag "record_commands_and_prompts" is set to True
-        if not record_commands_and_prompts:
-            return
-
-        prompt_data: Dict[Text, Any] = {
-            KEY_USER_PROMPT: user_prompt,
-            **({KEY_SYSTEM_PROMPT: system_prompt} if system_prompt else {}),
-        }
-
-        if llm_response is not None:
-            prompt_data[KEY_LLM_RESPONSE_METADATA] = llm_response.to_dict()
-        else:
-            prompt_data[KEY_LLM_RESPONSE_METADATA] = None
-
-        prompt_tuple = (prompt_name, prompt_data)
-
-        if message.get(PROMPTS) is not None:
-            prompts = message.get(PROMPTS)
-            if component_name in prompts:
-                prompts[component_name].append(prompt_tuple)
-            else:
-                prompts[component_name] = [prompt_tuple]
-        else:
-            prompts = {component_name: [prompt_tuple]}
-
-        message.set(
-            PROMPTS,
-            prompts,
-            add_to_output=True,
-        )

rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -32,7 +32,6 @@ from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.nlu.constants import FLOWS_IN_PROMPT
 from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.nlu.training_data.training_data import TrainingData
-from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.health_check.llm_health_check_mixin import LLMHealthCheckMixin
 from rasa.shared.utils.llm import (
     allowed_values_for_slot,
@@ -305,21 +304,22 @@ class LLMBasedCommandGenerator(
         )
         return filtered_flows
 
-    async def invoke_llm(self, prompt: Text) -> Optional[LLMResponse]:
+    async def invoke_llm(self, prompt: Text) -> Optional[Text]:
         """Use LLM to generate a response.
 
         Args:
             prompt: The prompt to send to the LLM.
 
         Returns:
-            An LLMResponse object.
+            The generated text.
 
         Raises:
-            ProviderClientAPIException: If an error occurs during the LLM API call.
+            ProviderClientAPIException if an error during API call.
         """
         llm = llm_factory(self.config.get(LLM_CONFIG_KEY), DEFAULT_LLM_CONFIG)
         try:
-            return await llm.acompletion(prompt)
+            llm_response = await llm.acompletion(prompt)
+            return llm_response.choices[0]
         except Exception as e:
             # unfortunately, langchain does not wrap LLM exceptions which means
             # we have to catch all exceptions here

rasa/dialogue_understanding/generator/llm_command_generator.py

@@ -10,7 +10,6 @@ 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.exceptions import ProviderClientAPIException
-from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.io import raise_deprecation_warning
 
 structlogger = structlog.get_logger()
@@ -54,7 +53,7 @@ class LLMCommandGenerator(SingleStepLLMCommandGenerator):
             **kwargs,
         )
 
-    async def invoke_llm(self, prompt: Text) -> Optional[LLMResponse]:
+    async def invoke_llm(self, prompt: Text) -> Optional[Text]:
         try:
             return await super().invoke_llm(prompt)
         except ProviderClientAPIException:

rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py

@@ -51,7 +51,6 @@ from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.nlu.constants import TEXT
 from rasa.shared.nlu.training_data.message import Message
-from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.io import deep_container_fingerprint
 from rasa.shared.utils.llm import (
     get_prompt_template,
@@ -145,6 +144,7 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
         **kwargs: Any,
     ) -> "MultiStepLLMCommandGenerator":
         """Loads trained component (see parent class for full docstring)."""
+
         # Perform health check of the LLM client config
         llm_config = resolve_model_client_config(config.get(LLM_CONFIG_KEY, {}))
         cls.perform_llm_health_check(
@@ -200,9 +200,6 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
                 message, flows, tracker
             )
             commands = self._clean_up_commands(commands)
-            self._add_commands_to_message_parse_data(
-                message, MultiStepLLMCommandGenerator.__name__, commands
-            )
         except ProviderClientAPIException:
             # if any step resulted in API exception, the command prediction cannot
             # be completed, "predict" the ErrorCommand
@@ -536,12 +533,7 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=prompt,
         )
 
-        response = await self.invoke_llm(prompt)
-        llm_response = LLMResponse.ensure_llm_response(response)
-        actions = None
-        if llm_response and llm_response.choices:
-            actions = llm_response.choices[0]
-
+        actions = await self.invoke_llm(prompt)
         structlogger.debug(
             "multi_step_llm_command_generator"
             ".predict_commands_for_active_flow"
@@ -550,16 +542,6 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
         )
 
         commands = self.parse_commands(actions, tracker, available_flows)
-
-        if commands:
-            self._add_prompt_to_message_parse_data(
-                message=message,
-                component_name=MultiStepLLMCommandGenerator.__name__,
-                prompt_name="fill_slots_for_active_flow_prompt",
-                user_prompt=prompt,
-                llm_response=llm_response,
-            )
-
         return commands
 
     async def _predict_commands_for_handling_flows(
@@ -591,12 +573,7 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=prompt,
         )
 
-        response = await self.invoke_llm(prompt)
-        llm_response = LLMResponse.ensure_llm_response(response)
-        actions = None
-        if llm_response and llm_response.choices:
-            actions = llm_response.choices[0]
-
+        actions = await self.invoke_llm(prompt)
         structlogger.debug(
             "multi_step_llm_command_generator"
             ".predict_commands_for_handling_flows"
@@ -608,15 +585,6 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
         # filter out flows that are already started and active
         commands = self._filter_redundant_start_flow_commands(tracker, commands)
 
-        if commands:
-            self._add_prompt_to_message_parse_data(
-                message=message,
-                component_name=MultiStepLLMCommandGenerator.__name__,
-                prompt_name="handle_flows_prompt",
-                user_prompt=prompt,
-                llm_response=llm_response,
-            )
-
         return commands
 
     @staticmethod
@@ -681,12 +649,7 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=prompt,
         )
 
-        response = await self.invoke_llm(prompt)
-        llm_response = LLMResponse.ensure_llm_response(response)
-        actions = None
-        if llm_response and llm_response.choices:
-            actions = llm_response.choices[0]
-
+        actions = await self.invoke_llm(prompt)
         structlogger.debug(
             "multi_step_llm_command_generator"
             ".predict_commands_for_newly_started_flow"
@@ -711,15 +674,6 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             commands=commands,
         )
 
-        if commands:
-            self._add_prompt_to_message_parse_data(
-                message=message,
-                component_name=MultiStepLLMCommandGenerator.__name__,
-                prompt_name="fill_slots_for_new_flow_prompt",
-                user_prompt=prompt,
-                llm_response=llm_response,
-            )
-
         return commands
 
     def _prepare_inputs(

rasa/dialogue_understanding/generator/nlu_command_adapter.py

@@ -205,9 +205,6 @@ class NLUCommandAdapter(GraphComponent, CommandGenerator):
             commands=commands,
         )
 
-        CommandGenerator._add_commands_to_message_parse_data(
-            message, NLUCommandAdapter.__name__, commands
-        )
         return commands
 
 

rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py

@@ -46,7 +46,6 @@ from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.nlu.constants import TEXT, LLM_COMMANDS, LLM_PROMPT
 from rasa.shared.nlu.training_data.message import Message
-from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.io import deep_container_fingerprint
 from rasa.shared.utils.llm import (
     get_prompt_template,
@@ -138,6 +137,7 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
         **kwargs: Any,
     ) -> "SingleStepLLMCommandGenerator":
         """Loads trained component (see parent class for full docstring)."""
+
         # Perform health check of the LLM API endpoint
         llm_config = resolve_model_client_config(config.get(LLM_CONFIG_KEY, {}))
         cls.perform_llm_health_check(
@@ -265,16 +265,13 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=flow_prompt,
         )
 
-        response = await self.invoke_llm(flow_prompt)
-        llm_response = LLMResponse.ensure_llm_response(response)
+        action_list = await self.invoke_llm(flow_prompt)
         # The check for 'None' maintains compatibility with older versions
         # of LLMCommandGenerator. In previous implementations, 'invoke_llm'
         # might return 'None' to indicate a failure to generate actions.
-        if llm_response is None or not llm_response.choices:
+        if action_list is None:
             return [ErrorCommand()]
 
-        action_list = llm_response.choices[0]
-
         log_llm(
             logger=structlogger,
             log_module="SingleStepLLMCommandGenerator",
@@ -285,16 +282,6 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
         commands = self.parse_commands(action_list, tracker, flows)
 
         self._update_message_parse_data_for_fine_tuning(message, commands, flow_prompt)
-        self._add_commands_to_message_parse_data(
-            message, SingleStepLLMCommandGenerator.__name__, commands
-        )
-        self._add_prompt_to_message_parse_data(
-            message=message,
-            component_name=SingleStepLLMCommandGenerator.__name__,
-            prompt_name="command_generator_prompt",
-            user_prompt=flow_prompt,
-            llm_response=llm_response,
-        )
 
         return commands
 

rasa/dialogue_understanding/patterns/continue_interrupted.py

@@ -40,3 +40,12 @@ class ContinueInterruptedPatternFlowStackFrame(PatternFlowStackFrame):
             step_id=data["step_id"],
             previous_flow_name=data["previous_flow_name"],
         )
+
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, ContinueInterruptedPatternFlowStackFrame):
+            return False
+        return (
+            self.flow_id == other.flow_id
+            and self.step_id == other.step_id
+            and self.previous_flow_name == other.previous_flow_name
+        )

rasa/dialogue_understanding/stack/utils.py

@@ -77,6 +77,7 @@ def top_user_flow_frame(dialogue_stack: DialogueStack) -> Optional[UserFlowStack
         if (
             isinstance(frame, UserFlowStackFrame)
             and frame.frame_type != FlowStackFrameType.CALL
+            and frame.frame_type != FlowStackFrameType.LINK
         ):
             return frame
     return None

rasa/e2e_test/e2e_test_case.py

@@ -5,7 +5,6 @@ from typing import Any, Dict, List, Optional, Text, Union
 
 import structlog
 
-from rasa.dialogue_understanding_test.du_test_case import DialogueUnderstandingTestCase
 from rasa.e2e_test.assertions import Assertion
 from rasa.e2e_test.constants import (
     KEY_ASSERTIONS,
@@ -552,7 +551,7 @@ class Metadata:
 class TestSuite:
     """Class for representing all top level test suite keys."""
 
-    test_cases: List[Union[TestCase, DialogueUnderstandingTestCase]]
+    test_cases: List[TestCase]
     fixtures: List[Fixture]
     metadata: List[Metadata]
     stub_custom_actions: Dict[Text, StubCustomAction]

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

@@ -404,7 +404,7 @@ def read_test_cases(path: str) -> TestSuite:
                 stub_data=stub_data,
             )
 
-    validate_test_case(test_case_name, input_test_cases, fixtures, metadata)
+    validate_test_case(test_case_name, input_test_cases)
     try:
         if stub_custom_actions:
             ensure_beta_feature_is_enabled(

rasa/e2e_test/utils/validation.py

@@ -6,7 +6,6 @@ import structlog
 
 import rasa.shared.utils.io
 from rasa.e2e_test.constants import SCHEMA_FILE_PATH
-from rasa.e2e_test.e2e_test_case import Fixture, Metadata
 from rasa.shared.utils.yaml import read_schema_file
 
 if TYPE_CHECKING:
@@ -28,24 +27,8 @@ def validate_path_to_test_cases(path: str) -> None:
         sys.exit(1)
 
 
-def validate_test_case(
-    test_case_name: str,
-    input_test_cases: List["TestCase"],
-    fixtures: Dict[str, Fixture],
-    metadata: Dict[str, Metadata],
-) -> None:
-    """
-    Validate the test case, its fixtures, and metadata.
-
-    Args:
-        test_case_name (str): The name of the test case to validate.
-        input_test_cases (List["TestCase"]): A list of test cases to validate.
-        fixtures (Dict[str, Fixture]): A dictionary of defined fixtures.
-        metadata (Dict[str, Metadata]): A dictionary of defined metadata.
-
-    Raises:
-        SystemExit: If the test case, fixtures, or metadata are not defined.
-    """
+def validate_test_case(test_case_name: str, input_test_cases: List["TestCase"]) -> None:
+    """Validate that test case exists."""
     if test_case_name and not input_test_cases:
         rasa.shared.utils.io.raise_warning(
             f"Test case does not exist: {test_case_name}. "
@@ -55,87 +38,6 @@ def validate_test_case(
         )
         sys.exit(1)
 
-    all_good = True
-    for test_case in input_test_cases:
-        all_good_fixtures = validate_test_case_fixtures(test_case, fixtures)
-        all_good_metadata = validate_test_case_metadata(test_case, metadata)
-        all_good = all_good and all_good_fixtures and all_good_metadata
-
-    if not all_good:
-        sys.exit(1)
-
-
-def validate_test_case_fixtures(
-    test_case: "TestCase", fixtures: Dict[str, Fixture]
-) -> bool:
-    """Validates that the fixtures used in the test case are defined.
-
-    Args:
-        test_case (TestCase): The test case to validate.
-        fixtures (Dict[str, Fixture]): A dictionary of defined fixtures.
-
-    Returns:
-        True if all fixtures used in the test case are defined, False otherwise.
-
-    Raises:
-        Logs an error if a fixture used in the test case is not defined.
-    """
-    all_good = True
-    if not test_case.fixture_names:
-        return all_good
-
-    for fixture_name in test_case.fixture_names:
-        if fixture_name not in fixtures:
-            structlogger.error(
-                "validation.validate_test_case_fixtures",
-                event_info=(
-                    f"Fixture '{fixture_name}' referenced in the "
-                    f"test case '{test_case.name}' is not defined."
-                ),
-            )
-            all_good = False
-    return all_good
-
-
-def validate_test_case_metadata(
-    test_case: "TestCase", metadata: Dict[str, Metadata]
-) -> bool:
-    """
-    Validates that the metadata used in the test case and its steps are defined.
-
-    Args:
-        test_case (TestCase): The test case to validate.
-        metadata (Dict[str, Metadata]): A dictionary of defined metadata.
-
-    Returns:
-        True if all fixtures used in the test case are defined, False otherwise.
-
-    Raises:
-        Logs an error if metadata used in the test case or its steps is not defined.
-    """
-    all_good = True
-    if test_case.metadata_name and test_case.metadata_name not in metadata:
-        structlogger.error(
-            "validation.validate_test_case_metadata.test_case_metadata",
-            event_info=(
-                f"Metadata '{test_case.metadata_name}' referenced in "
-                f"the test case '{test_case.name}' is not defined."
-            ),
-        )
-        all_good = False
-
-    for step in test_case.steps:
-        if step.metadata_name and step.metadata_name not in metadata:
-            structlogger.error(
-                "validation.validate_test_case_metadata.step_metadata",
-                event_info=(
-                    f"Metadata '{step.metadata_name}' referenced in the "
-                    f"step of the test case '{test_case.name}' is not defined."
-                ),
-            )
-            all_good = False
-    return all_good
-
 
 def validate_model_path(model_path: Optional[str], parameter: str, default: str) -> str:
     """Validate the model path.