rasa-pro 3.11.3a1.dev7__py3-none-any.whl → 3.11.5__py3-none-any.whl

rasa/core/policies/enterprise_search_policy.py

@@ -2,7 +2,6 @@ import importlib.resources
 import json
 import re
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Text
-
 import dotenv
 import structlog
 from jinja2 import Template
@@ -64,19 +63,11 @@ from rasa.shared.core.events import Event, UserUttered, BotUttered
 from rasa.shared.core.generator import TrackerWithCachedStates
 from rasa.shared.core.trackers import DialogueStateTracker, EventVerbosity
 from rasa.shared.exceptions import RasaException, FileIOException
-from rasa.shared.nlu.constants import (
-    PROMPTS,
-    KEY_USER_PROMPT,
-    KEY_LLM_RESPONSE_METADATA,
-    KEY_PROMPT_NAME,
-    KEY_COMPONENT_NAME,
-)
 from rasa.shared.nlu.training_data.training_data import TrainingData
 from rasa.shared.providers.embedding._langchain_embedding_client_adapter import (
     _LangchainEmbeddingClientAdapter,
 )
 from rasa.shared.providers.llm.llm_client import LLMClient
-from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.cli import print_error_and_exit
 from rasa.shared.utils.health_check.embeddings_health_check_mixin import (
     EmbeddingsHealthCheckMixin,
@@ -281,43 +272,6 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
         # Wrap the embedding client in the adapter
         return _LangchainEmbeddingClientAdapter(client)
 
-    @classmethod
-    def _add_prompt_and_llm_response_to_latest_message(
-        cls,
-        tracker: DialogueStateTracker,
-        prompt_name: str,
-        user_prompt: str,
-        llm_response: Optional[LLMResponse] = None,
-    ) -> None:
-        """Stores the prompt and LLMResponse metadata in the tracker.
-
-        Args:
-            tracker: The DialogueStateTracker containing the current conversation state.
-            prompt_name: A name identifying prompt usage.
-            user_prompt: The user prompt that was sent to the LLM.
-            llm_response: The response object from the LLM (None if no response).
-        """
-        from rasa.dialogue_understanding.utils import record_commands_and_prompts
-
-        if not record_commands_and_prompts:
-            return
-
-        if not tracker.latest_message:
-            return
-
-        parse_data = tracker.latest_message.parse_data
-        if PROMPTS not in parse_data:
-            parse_data[PROMPTS] = []  # type: ignore[literal-required]
-
-        prompt_data: Dict[Text, Any] = {
-            KEY_COMPONENT_NAME: cls.__name__,
-            KEY_PROMPT_NAME: prompt_name,
-            KEY_USER_PROMPT: user_prompt,
-            KEY_LLM_RESPONSE_METADATA: llm_response.to_dict() if llm_response else None,
-        }
-
-        parse_data[PROMPTS].append(prompt_data)  # type: ignore[literal-required]
-
     def train(  # type: ignore[override]
         self,
         training_trackers: List[TrackerWithCachedStates],
@@ -544,27 +498,13 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
 
         if self.use_llm:
             prompt = self._render_prompt(tracker, documents.results)
-            llm_response = await self._generate_llm_answer(llm, prompt)
-            llm_response = LLMResponse.ensure_llm_response(llm_response)
-
-            self._add_prompt_and_llm_response_to_latest_message(
-                tracker=tracker,
-                prompt_name="enterprise_search_prompt",
-                user_prompt=prompt,
-                llm_response=llm_response,
-            )
+            llm_answer = await self._generate_llm_answer(llm, prompt)
 
-            if llm_response is None or not llm_response.choices:
-                logger.debug(f"{logger_key}.no_llm_response")
-                response = None
-            else:
-                llm_answer = llm_response.choices[0]
+            if self.citation_enabled:
+                llm_answer = self.post_process_citations(llm_answer)
 
-                if self.citation_enabled:
-                    llm_answer = self.post_process_citations(llm_answer)
-
-                logger.debug(f"{logger_key}.llm_answer", llm_answer=llm_answer)
-                response = llm_answer
+            logger.debug(f"{logger_key}.llm_answer", llm_answer=llm_answer)
+            response = llm_answer
         else:
             response = documents.results[0].metadata.get("answer", None)
             if not response:
@@ -576,6 +516,7 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
                 "enterprise_search_policy.predict_action_probabilities.no_llm",
                 search_results=documents,
             )
+
         if response is None:
             return self._create_prediction_internal_error(domain, tracker)
 
@@ -640,18 +581,10 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
 
     async def _generate_llm_answer(
         self, llm: LLMClient, prompt: Text
-    ) -> Optional[LLMResponse]:
-        """Fetches an LLM completion for the provided prompt.
-
-        Args:
-            llm: The LLM client used to get the completion.
-            prompt: The prompt text to send to the model.
-
-        Returns:
-            An LLMResponse object, or None if the call fails.
-        """
+    ) -> Optional[Text]:
         try:
-            return await llm.acompletion(prompt)
+            llm_response = await llm.acompletion(prompt)
+            llm_answer = llm_response.choices[0]
         except Exception as e:
             # unfortunately, langchain does not wrap LLM exceptions which means
             # we have to catch all exceptions here
@@ -659,7 +592,9 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
                 "enterprise_search_policy._generate_llm_answer.llm_error",
                 error=e,
             )
-            return None
+            llm_answer = None
+
+        return llm_answer
 
     def _create_prediction(
         self,

rasa/core/policies/flows/flow_executor.py

@@ -82,7 +82,6 @@ from rasa.shared.core.flows.steps import (
     NoOperationFlowStep,
 )
 from rasa.shared.core.flows.steps.collect import SlotRejection
-from rasa.shared.core.flows.steps.constants import START_STEP
 from rasa.shared.core.slots import Slot
 from rasa.shared.core.trackers import (
     DialogueStateTracker,
@@ -317,7 +316,7 @@ def reset_scoped_slots(
     def _reset_slot(slot_name: Text, dialogue_tracker: DialogueStateTracker) -> None:
         slot = dialogue_tracker.slots.get(slot_name, None)
         initial_value = slot.initial_value if slot else None
-        events.append(SlotSet(slot_name, initial_value, metadata={"reset": True}))
+        events.append(SlotSet(slot_name, initial_value))
 
     if (
         isinstance(current_frame, UserFlowStackFrame)
@@ -449,7 +448,6 @@ def advance_flows_until_next_action(
                     tracker,
                     available_actions,
                     flows,
-                    previous_step_id,
                 )
                 new_events = step_result.events
                 if (
@@ -466,9 +464,6 @@ def advance_flows_until_next_action(
                     new_events.insert(
                         idx, FlowCompleted(active_frame.flow_id, previous_step_id)
                     )
-                attach_stack_metadata_to_events(
-                    next_step.id, current_flow.id, new_events
-                )
                 tracker.update_stack(step_stack)
                 tracker.update_with_events(new_events)
 
@@ -572,17 +567,6 @@ def validate_custom_slot_mappings(
     return True
 
 
-def attach_stack_metadata_to_events(
-    step_id: str,
-    flow_id: str,
-    events: List[Event],
-) -> None:
-    """Attach the stack metadata to the events."""
-    for event in events:
-        event.metadata[STEP_ID_METADATA_KEY] = step_id
-        event.metadata[ACTIVE_FLOW_METADATA_KEY] = flow_id
-
-
 def run_step(
     step: FlowStep,
     flow: Flow,
@@ -590,7 +574,6 @@ def run_step(
     tracker: DialogueStateTracker,
     available_actions: List[str],
     flows: FlowsList,
-    previous_step_id: str,
 ) -> FlowStepResult:
     """Run a single step of a flow.
 
@@ -608,19 +591,12 @@ def run_step(
         tracker: The tracker to run the step on.
         available_actions: The actions that are available in the domain.
         flows: All flows.
-        previous_step_id: The ID of the previous step.
 
     Returns:
     A result of running the step describing where to transition to.
     """
     initial_events: List[Event] = []
-    if previous_step_id == START_STEP:
-        # if the previous step id is the start step, we need to add a flow
-        # started event to the initial events.
-        # we can't use the current step to check this, as the current step is the
-        # first step in the flow -> other steps might link to this flow, so the
-        # only reliable way to check if we are starting a new flow is checking for
-        # the START_STEP meta step
+    if step == flow.first_step_in_flow():
         initial_events.append(FlowStarted(flow.id, metadata=stack.current_context()))
 
     if isinstance(step, CollectInformationFlowStep):

rasa/core/processor.py

@@ -818,9 +818,8 @@ class MessageProcessor:
         return parse_data
 
     def _sanitize_message(self, message: UserMessage) -> UserMessage:
-        """Sanitize user messages.
-
-        Removes prepended slashes before the actual content.
+        """Sanitize user message by removing prepended slashes before the
+        actual content.
         """
         # Regex pattern to match leading slashes and any whitespace before
         # actual content
@@ -922,7 +921,9 @@ class MessageProcessor:
         return [command.as_dict() for command in commands]
 
     def _contains_undefined_intent(self, message: Message) -> bool:
-        """Checks if the message contains an undefined intent."""
+        """Checks if the message contains an intent that is undefined
+        in the domain.
+        """
         intent_name = message.get(INTENT, {}).get("name")
         return intent_name is not None and intent_name not in self.domain.intents
 
@@ -986,8 +987,6 @@ class MessageProcessor:
         if parse_data["entities"]:
             self._log_slots(tracker)
 
-        plugin_manager().hook.after_new_user_message(tracker=tracker)
-
         logger.debug(
             f"Logged UserUtterance - tracker now has {len(tracker.events)} events."
         )
@@ -1306,7 +1305,7 @@ class MessageProcessor:
             self._log_slots(tracker)
 
         await self.execute_side_effects(events, tracker, output_channel)
-        plugin_manager().hook.after_action_executed(tracker=tracker)
+
         return self.should_predict_another_action(action.name())
 
     def _log_action_on_tracker(
@@ -1442,10 +1441,8 @@ class MessageProcessor:
         return len(filtered_commands) > 0
 
     def _is_calm_assistant(self) -> bool:
-        """Inspects the nodes of the graph schema to decide if we are in CALM.
-
-        To determine whether we are in CALM mode, we check if any node is
-        associated with the `FlowPolicy`, which is indicative of a
+        """Inspects the nodes of the graph schema to determine whether
+        any node is associated with the `FlowPolicy`, which is indicative of a
         CALM assistant setup.
 
         Returns:

rasa/dialogue_understanding/generator/command_generator.py

@@ -10,29 +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,
-    KEY_PROMPT_NAME,
-    KEY_COMPONENT_NAME,
-)
 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()
 
@@ -204,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.
         """
@@ -353,106 +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: [
-                  {
-                    "component_name": "MultiStepLLMCommandGenerator",
-                    "prompt_name": "fill_slots_prompt",
-                    "user_prompt": "...",
-                    "system_prompt": "...",
-                    "llm_response_metadata": { ... }
-                  },
-                  {
-                    "component_name": "MultiStepLLMCommandGenerator",
-                    "prompt_name": "handle_flows_prompt",
-                    "user_prompt": "...",
-                    "system_prompt": "...",
-                    "llm_response_metadata": { ... }
-                  },
-                  {
-                    "component_name": "SingleStepLLMCommandGenerator",
-                    "prompt_name": "prompt_template",
-                    "user_prompt": "...",
-                    "system_prompt": "...",
-                    "llm_response_metadata": { ... }
-                  }
-                ]
-            })
-        """
-        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
-
-        # Construct the dictionary with prompt details.
-        prompt_data: Dict[Text, Any] = {
-            KEY_COMPONENT_NAME: component_name,
-            KEY_PROMPT_NAME: prompt_name,
-            KEY_USER_PROMPT: user_prompt,
-            KEY_LLM_RESPONSE_METADATA: llm_response.to_dict() if llm_response else None,
-            **({KEY_SYSTEM_PROMPT: system_prompt} if system_prompt else {}),
-        }
-
-        # Get or create a top-level "prompts" list.
-        prompts = message.get(PROMPTS) or []
-        prompts.append(prompt_data)
-
-        # Update the message with the new prompts list.
-        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