rasa-pro 3.13.13__py3-none-any.whl → 3.13.14__py3-none-any.whl

rasa/constants.py

@@ -27,6 +27,7 @@ ENV_LOG_LEVEL_LIBRARIES = "LOG_LEVEL_LIBRARIES"
 ENV_LOG_LEVEL_MATPLOTLIB = "LOG_LEVEL_MATPLOTLIB"
 ENV_LOG_LEVEL_RABBITMQ = "LOG_LEVEL_RABBITMQ"
 ENV_LOG_LEVEL_KAFKA = "LOG_LEVEL_KAFKA"
+ENV_LOG_LEVEL_PYMONGO = "LOG_LEVEL_PYMONGO"
 
 DEFAULT_SANIC_WORKERS = 1
 ENV_SANIC_WORKERS = "SANIC_WORKERS"

rasa/core/actions/action_clean_stack.py

@@ -4,9 +4,11 @@ from typing import Any, Dict, List, Optional
 
 import structlog
 
+import rasa.dialogue_understanding.stack.utils
 from rasa.core.actions.action import Action
 from rasa.core.channels import OutputChannel
 from rasa.core.nlg import NaturalLanguageGenerator
+from rasa.dialogue_understanding.patterns.code_change import FLOW_PATTERN_CODE_CHANGE_ID
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.dialogue_understanding.stack.frames import (
     BaseFlowStackFrame,
@@ -41,6 +43,15 @@ class ActionCleanStack(Action):
         """Clean the stack."""
         structlogger.debug("action_clean_stack.run")
         new_frames = []
+        top_flow_frame = rasa.dialogue_understanding.stack.utils.top_flow_frame(
+            tracker.stack, ignore_call_frames=False
+        )
+        top_user_flow_frame = (
+            rasa.dialogue_understanding.stack.utils.top_user_flow_frame(
+                tracker.stack, ignore_call_and_link_frames=False
+            )
+        )
+
         # Set all frames to their end step, filter out any non-BaseFlowStackFrames
         for frame in tracker.stack.frames:
             if isinstance(frame, BaseFlowStackFrame):
@@ -56,4 +67,25 @@ class ActionCleanStack(Action):
                 new_frames.append(frame)
         new_stack = DialogueStack.from_dict([frame.as_dict() for frame in new_frames])
 
+        # Check if the action is being called from within a user flow
+        if (
+            top_flow_frame
+            and top_flow_frame.flow_id != FLOW_PATTERN_CODE_CHANGE_ID
+            and top_user_flow_frame
+            and top_user_flow_frame.flow_id == top_flow_frame.flow_id
+        ):
+            # The action is being called from within a user flow on the stack.
+            # If there are other frames on the stack, we need to make sure
+            # the last executed frame is the end step of the current user flow so
+            # that we can trigger pattern_completed for this user flow.
+            new_stack.pop()
+            structlogger.debug(
+                "action_clean_stack.pushing_user_frame_at_the_bottom_of_stack",
+                flow_id=top_user_flow_frame.flow_id,
+            )
+            new_stack.push(
+                top_user_flow_frame,
+                index=0,
+            )
+
         return tracker.create_stack_updated_events(new_stack)

rasa/core/actions/constants.py

@@ -3,3 +3,7 @@ SELECTIVE_DOMAIN = "enable_selective_domain"
 
 SSL_CLIENT_CERT_FIELD = "ssl_client_cert"
 SSL_CLIENT_KEY_FIELD = "ssl_client_key"
+
+# Special marker key used by EndpointConfig to indicate 449 status
+# without raising an exception
+MISSING_DOMAIN_MARKER = "missing_domain"

rasa/core/actions/custom_action_executor.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 import abc
 import logging
-from typing import TYPE_CHECKING, Any, Dict, Text
+from enum import Enum
+from typing import TYPE_CHECKING, Any, Dict, Optional, Text
+
+from pydantic import BaseModel
 
 import rasa
 from rasa.core.actions.action_exceptions import DomainNotFound
@@ -19,6 +22,23 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
+class ActionResultType(Enum):
+    SUCCESS = "success"
+    RETRY_WITH_DOMAIN = "retry_with_domain"
+
+
+class ActionResult(BaseModel):
+    """Result of custom action execution.
+
+    This is used to avoid raising exceptions for expected conditions
+    like missing domain (449 status code), which would otherwise be
+    captured by tracing as errors.
+    """
+
+    result_type: ActionResultType
+    response: Optional[Dict[Text, Any]] = None
+
+
 class CustomActionExecutor(abc.ABC):
     """Interface for custom action executors.
 
@@ -45,6 +65,34 @@ class CustomActionExecutor(abc.ABC):
         """
         pass
 
+    async def run_with_result(
+        self,
+        tracker: "DialogueStateTracker",
+        domain: "Domain",
+        include_domain: bool = False,
+    ) -> ActionResult:
+        """Executes the custom action and returns a result.
+
+        This method is used to avoid raising exceptions for expected conditions
+        like missing domain, which would otherwise be captured by tracing as errors.
+
+        By default, this method calls the run method and wraps the response
+        for backward compatibility.
+
+        Args:
+            tracker: The current state of the dialogue.
+            domain: The domain object containing domain-specific information.
+            include_domain: If True, the domain is included in the request.
+
+        Returns:
+            ActionResult containing the response and result type.
+        """
+        try:
+            response = await self.run(tracker, domain, include_domain)
+            return ActionResult(result_type=ActionResultType.SUCCESS, response=response)
+        except DomainNotFound:
+            return ActionResult(result_type=ActionResultType.RETRY_WITH_DOMAIN)
+
 
 class NoEndpointCustomActionExecutor(CustomActionExecutor):
     """Implementation of a custom action executor when endpoint is not set.
@@ -163,13 +211,13 @@ class RetryCustomActionExecutor(CustomActionExecutor):
         domain: "Domain",
         include_domain: bool = False,
     ) -> Dict[Text, Any]:
-        """Runs the wrapped custom action executor.
+        """Runs the wrapped custom action executor with retry logic.
 
         First request to the action server is made with/without the domain
         as specified by the `include_domain` parameter.
 
-        If the action server responds with a `DomainNotFound` error, by running the
-        custom action executor again with the domain information.
+        If the action server responds with a missing domain indication,
+        retries the request with the domain included.
 
         Args:
             tracker: The current state of the dialogue.
@@ -178,14 +226,24 @@ class RetryCustomActionExecutor(CustomActionExecutor):
 
         Returns:
             The response from the execution of the custom action.
+
+        Raises:
+            DomainNotFound: If the action server still requires domain after retry.
         """
-        try:
-            return await self._custom_action_executor.run(
-                tracker,
-                domain,
-                include_domain=include_domain,
-            )
-        except DomainNotFound:
-            return await self._custom_action_executor.run(
+        result = await self._custom_action_executor.run_with_result(
+            tracker,
+            domain,
+            include_domain=include_domain,
+        )
+
+        if result.result_type == ActionResultType.RETRY_WITH_DOMAIN:
+            # Retry with domain included
+            result = await self._custom_action_executor.run_with_result(
                 tracker, domain, include_domain=True
             )
+
+            # If still missing domain after retry, raise error
+            if result.result_type == ActionResultType.RETRY_WITH_DOMAIN:
+                raise DomainNotFound()
+
+        return result.response if result.response is not None else {}

rasa/core/actions/grpc_custom_action_executor.py

@@ -11,6 +11,8 @@ from rasa_sdk.grpc_py import action_webhook_pb2, action_webhook_pb2_grpc
 from rasa.core.actions.action_exceptions import DomainNotFound
 from rasa.core.actions.constants import SSL_CLIENT_CERT_FIELD, SSL_CLIENT_KEY_FIELD
 from rasa.core.actions.custom_action_executor import (
+    ActionResult,
+    ActionResultType,
     CustomActionExecutor,
     CustomActionRequestWriter,
 )
@@ -101,13 +103,51 @@ class GRPCCustomActionExecutor(CustomActionExecutor):
 
         Returns:
             Response from the action server.
+            Returns empty dict if domain is missing.
+
+        Raises:
+            RasaException: If an error occurs while making the gRPC request
+                (other than missing domain).
         """
+        result = await self.run_with_result(tracker, domain, include_domain)
+
+        # Return empty dict for retry cases to avoid raising exceptions
+        # RetryCustomActionExecutor will handle the retry logic
+        if result.result_type == ActionResultType.RETRY_WITH_DOMAIN:
+            return {}
+
+        return result.response if result.response is not None else {}
+
+    async def run_with_result(
+        self,
+        tracker: "DialogueStateTracker",
+        domain: "Domain",
+        include_domain: bool = False,
+    ) -> ActionResult:
+        """Execute the custom action and return an ActionResult.
+
+        This method avoids raising DomainNotFound exception for missing domain,
+        instead returning an ActionResult with RETRY_WITH_DOMAIN type.
+        This prevents tracing from capturing this expected condition as an error.
 
+        Args:
+            tracker: Tracker for the current conversation.
+            domain: Domain of the assistant.
+            include_domain: If True, the domain is included in the request.
+
+        Returns:
+            ActionResult containing the response and result type.
+        """
         request = self._create_payload(
             tracker=tracker, domain=domain, include_domain=include_domain
         )
 
-        return self._request(request)
+        try:
+            response = self._request(request)
+            return ActionResult(result_type=ActionResultType.SUCCESS, response=response)
+        except DomainNotFound:
+            # Return retry result instead of raising DomainNotFound
+            return ActionResult(result_type=ActionResultType.RETRY_WITH_DOMAIN)
 
     def _request(
         self,
@@ -121,7 +161,6 @@ class GRPCCustomActionExecutor(CustomActionExecutor):
         Returns:
             Response from the action server.
         """
-
         client = self._create_grpc_client()
         metadata = self._build_metadata()
         try:

rasa/core/actions/http_custom_action_executor.py

@@ -4,8 +4,11 @@ from typing import TYPE_CHECKING, Any, Dict, Optional
 
 import aiohttp
 
-from rasa.core.actions.action_exceptions import ActionExecutionRejection, DomainNotFound
+from rasa.core.actions.action_exceptions import ActionExecutionRejection
+from rasa.core.actions.constants import MISSING_DOMAIN_MARKER
 from rasa.core.actions.custom_action_executor import (
+    ActionResult,
+    ActionResultType,
     CustomActionExecutor,
     CustomActionRequestWriter,
 )
@@ -18,12 +21,12 @@ from rasa.shared.core.domain import Domain
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.exceptions import RasaException
 from rasa.utils.common import get_bool_env_variable
+from rasa.utils.endpoints import ClientResponseError, EndpointConfig
 
 if TYPE_CHECKING:
     from rasa.shared.core.domain import Domain
     from rasa.shared.core.trackers import DialogueStateTracker
 
-from rasa.utils.endpoints import ClientResponseError, EndpointConfig
 
 logger = logging.getLogger(__name__)
 
@@ -62,9 +65,40 @@ class HTTPCustomActionExecutor(CustomActionExecutor):
 
         Returns:
             A dictionary containing the response from the custom action endpoint.
+            Returns empty dict if domain is missing (449 status).
 
         Raises:
-            RasaException: If an error occurs while making the HTTP request.
+            RasaException: If an error occurs while making the HTTP request
+                (other than missing domain).
+        """
+        result = await self.run_with_result(tracker, domain, include_domain)
+
+        # Return empty dict for retry cases to avoid raising exceptions
+        # RetryCustomActionExecutor will handle the retry logic
+        if result.result_type == ActionResultType.RETRY_WITH_DOMAIN:
+            return {}
+
+        return result.response if result.response is not None else {}
+
+    async def run_with_result(
+        self,
+        tracker: "DialogueStateTracker",
+        domain: Optional["Domain"] = None,
+        include_domain: bool = False,
+    ) -> ActionResult:
+        """Execute the custom action and return an ActionResult.
+
+        This method avoids raising DomainNotFound exception for 449 status code,
+        instead returning an ActionResult with RETRY_WITH_DOMAIN type.
+        This prevents tracing from capturing this expected condition as an error.
+
+        Args:
+            tracker: The current state of the dialogue.
+            domain: The domain object containing domain-specific information.
+            include_domain: If True, the domain is included in the request.
+
+        Returns:
+            ActionResult containing the response and result type.
         """
         from rasa.core.actions.action import RemoteActionJSONValidator
 
@@ -77,14 +111,23 @@ class HTTPCustomActionExecutor(CustomActionExecutor):
                 tracker=tracker, domain=domain, include_domain=include_domain
             )
 
-            response = await self._perform_request_with_retries(json_body)
+            assert self.action_endpoint is not None
+            response = await self.action_endpoint.request(
+                json=json_body,
+                method="post",
+                timeout=DEFAULT_REQUEST_TIMEOUT,
+                compress=self.should_compress,
+            )
+
+            # Check if we got the special marker for 449 status (missing domain)
+            if isinstance(response, dict) and response.get(MISSING_DOMAIN_MARKER):
+                return ActionResult(result_type=ActionResultType.RETRY_WITH_DOMAIN)
 
             if response is None:
                 response = {}
 
             RemoteActionJSONValidator.validate(response)
-
-            return response
+            return ActionResult(result_type=ActionResultType.SUCCESS, response=response)
 
         except ClientResponseError as e:
             if e.status == 400:
@@ -131,22 +174,3 @@ class HTTPCustomActionExecutor(CustomActionExecutor):
                 "and returns a 200 once the action is executed. "
                 "Error: {}".format(self.action_name, status, e)
             )
-
-    async def _perform_request_with_retries(
-        self,
-        json_body: Dict[str, Any],
-    ) -> Any:
-        """Attempts to perform the request with retries if necessary."""
-        assert self.action_endpoint is not None
-        try:
-            return await self.action_endpoint.request(
-                json=json_body,
-                method="post",
-                timeout=DEFAULT_REQUEST_TIMEOUT,
-                compress=self.should_compress,
-            )
-        except ClientResponseError as e:
-            # Repeat the request because Domain was not in the payload
-            if e.status == 449:
-                raise DomainNotFound()
-            raise e

rasa/core/channels/voice_stream/voice_channel.py

@@ -176,6 +176,8 @@ class VoiceOutputChannel(OutputChannel):
     async def send_start_marker(self, recipient_id: str) -> None:
         """Send a marker message before the first audio chunk."""
         # Default implementation uses the generic marker message
+        call_state.is_bot_speaking = True  # type: ignore[attr-defined]
+        VoiceInputChannel._cancel_silence_timeout_watcher()
         await self.send_marker_message(recipient_id)
 
     async def send_intermediate_marker(self, recipient_id: str) -> None:
@@ -212,10 +214,6 @@ class VoiceOutputChannel(OutputChannel):
     ) -> None:
         text = remove_emojis(text)
         self.update_silence_timeout()
-        cached_audio_bytes = self.tts_cache.get(text)
-        collected_audio_bytes = RasaAudioBytes(b"")
-        seconds_marker = -1
-        last_sent_offset = 0
         logger.debug("voice_channel.sending_audio", text=text)
 
         # Send start marker before first chunk
@@ -224,17 +222,11 @@ class VoiceOutputChannel(OutputChannel):
         except (WebsocketClosed, ServerError):
             call_state.connection_failed = True  # type: ignore[attr-defined]
 
-        if cached_audio_bytes:
-            audio_stream = self.chunk_audio(cached_audio_bytes)
-        else:
-            # Todo: make kwargs compatible with engine config
-            synth_config = self.tts_engine.config.__class__.from_dict({})
-            try:
-                audio_stream = self.tts_engine.synthesize(text, synth_config)
-            except TTSError:
-                # TODO: add message that works without tts, e.g. loading from disc
-                audio_stream = self.chunk_audio(generate_silence())
+        audio_stream = await self._create_audio_stream(text)
 
+        collected_audio_bytes = RasaAudioBytes(b"")
+        last_sent_offset = 0
+        seconds_marker = -1
         async for audio_bytes in audio_stream:
             collected_audio_bytes = RasaAudioBytes(collected_audio_bytes + audio_bytes)
 
@@ -249,6 +241,8 @@ class VoiceOutputChannel(OutputChannel):
                     await self.send_audio_bytes(recipient_id, new_bytes)
                     last_sent_offset = len(collected_audio_bytes)
 
+                    # seconds of audio rounded down to floor number
+                    # e.g 7 // 2 = 3
                     full_seconds_of_audio = len(collected_audio_bytes) // HERTZ
                     if full_seconds_of_audio > seconds_marker:
                         await self.send_intermediate_marker(recipient_id)
@@ -275,7 +269,7 @@ class VoiceOutputChannel(OutputChannel):
             pass
         call_state.latest_bot_audio_id = self.latest_message_id  # type: ignore[attr-defined]
 
-        if not cached_audio_bytes:
+        if not self.tts_cache.get(text):
             self.tts_cache.put(text, collected_audio_bytes)
 
     async def send_audio_bytes(
@@ -300,6 +294,22 @@ class VoiceOutputChannel(OutputChannel):
     async def hangup(self, recipient_id: str, **kwargs: Any) -> None:
         call_state.should_hangup = True  # type: ignore[attr-defined]
 
+    async def _create_audio_stream(self, text: str) -> AsyncIterator[RasaAudioBytes]:
+        cached_audio_bytes = self.tts_cache.get(text)
+
+        if cached_audio_bytes:
+            audio_stream = self.chunk_audio(cached_audio_bytes)
+        else:
+            # Todo: make kwargs compatible with engine config
+            synth_config = self.tts_engine.config.__class__.from_dict({})
+            try:
+                audio_stream = self.tts_engine.synthesize(text, synth_config)
+            except TTSError:
+                # TODO: add message that works without tts, e.g. loading from disc
+                audio_stream = self.chunk_audio(generate_silence())
+
+        return audio_stream
+
 
 class VoiceInputChannel(InputChannel):
     # All children of this class require a voice license to be used.
@@ -435,7 +445,7 @@ class VoiceInputChannel(InputChannel):
                     # relevant when the bot speaks multiple messages in one turn
                     self._cancel_silence_timeout_watcher()
 
-                # we just stopped speaking, starting a watcher for silence timeout
+                # bot just stopped speaking, starting a watcher for silence timeout
                 if was_bot_speaking_before and not is_bot_speaking_after:
                     logger.debug("voice_channel.bot_stopped_speaking")
                     self._cancel_silence_timeout_watcher()

rasa/core/policies/flows/flow_executor.py

@@ -333,6 +333,10 @@ def reset_scoped_slots(
     flow_persistable_slots = current_flow.persisted_slots
 
     for step in current_flow.steps_with_calls_resolved:
+        # take persisted slots from called flows into consideration
+        # before resetting slots
+        if isinstance(step, CallFlowStep) and step.called_flow_reference:
+            flow_persistable_slots.extend(step.called_flow_reference.persisted_slots)
         if isinstance(step, CollectInformationFlowStep):
             # reset all slots scoped to the flow
             slot_name = step.collect
@@ -344,7 +348,22 @@ def reset_scoped_slots(
     # slots set by the set slots step should be reset after the flow ends
     # unless they are also used in a collect step where `reset_after_flow_ends`
     # is set to `False` or set in the `persisted_slots` list.
-    resettable_set_slots = [
+    resettable_set_slots = _get_resettable_set_slots(
+        current_flow, not_resettable_slot_names, flow_persistable_slots
+    )
+    for name in resettable_set_slots:
+        _reset_slot(name, tracker)
+
+    return events
+
+
+def _get_resettable_set_slots(
+    current_flow: Flow,
+    not_resettable_slot_names: set[Text],
+    flow_persistable_slots: List[Text],
+) -> List[Text]:
+    """Get list of slot names from SetSlotsFlowStep that should be reset."""
+    return [
         slot["key"]
         for step in current_flow.steps_with_calls_resolved
         if isinstance(step, SetSlotsFlowStep)
@@ -353,11 +372,6 @@ def reset_scoped_slots(
         and slot["key"] not in flow_persistable_slots
     ]
 
-    for name in resettable_set_slots:
-        _reset_slot(name, tracker)
-
-    return events
-
 
 def advance_flows(
     tracker: DialogueStateTracker, available_actions: List[str], flows: FlowsList

rasa/core/run.py

@@ -88,7 +88,6 @@ def _create_single_channel(
 
     if channel in BUILTIN_CHANNELS:
         channel_class = BUILTIN_CHANNELS[channel]
-
         return channel_class.from_credentials(credentials)
     else:
         # try to load channel based on class name

rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -60,7 +60,9 @@ structlogger = structlog.get_logger()
 class LLMBasedCommandGenerator(
     LLMHealthCheckMixin, GraphComponent, CommandGenerator, ABC
 ):
-    """An abstract class defining interface and common functionality
+    """This class provides common functionality for all LLM-based command generators.
+
+    An abstract class defining interface and common functionality
     of an LLM-based command generators.
     """
 
@@ -172,8 +174,9 @@ class LLMBasedCommandGenerator(
     def train(
         self, training_data: TrainingData, flows: FlowsList, domain: Domain
     ) -> Resource:
-        """Train the llm based command generator. Stores all flows into a vector
-        store.
+        """Trains the LLM-based command generator and prepares flow retrieval data.
+
+        Stores all flows into a vector store.
         """
         self.perform_llm_health_check(
             self.config.get(LLM_CONFIG_KEY),

rasa/dialogue_understanding/generator/single_step/compact_llm_command_generator.py

@@ -132,7 +132,20 @@ class CompactLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         if prompt_template is not None:
             return prompt_template
 
-        # Get the default prompt template based on the model name.
+        # Try to load the template from the given path or fallback to the default for
+        # the component.
+        custom_prompt_template_path = config.get(PROMPT_TEMPLATE_CONFIG_KEY)
+        if custom_prompt_template_path is not None:
+            custom_prompt_template = get_prompt_template(
+                custom_prompt_template_path,
+                None,  # Default will be based on the model
+                log_source_component=log_source_component,
+                log_source_method=log_context,
+            )
+            if custom_prompt_template is not None:
+                return custom_prompt_template
+
+        # Fallback to the default prompt template based on the model.
         default_command_prompt_template = get_default_prompt_template_based_on_model(
             llm_config=config.get(LLM_CONFIG_KEY, {}) or {},
             model_prompt_mapping=cls.get_model_prompt_mapper(),
@@ -142,10 +155,4 @@ class CompactLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
             log_source_method=log_context,
         )
 
-        # Return the prompt template either from the config or the default prompt.
-        return get_prompt_template(
-            config.get(PROMPT_TEMPLATE_CONFIG_KEY),
-            default_command_prompt_template,
-            log_source_component=log_source_component,
-            log_source_method=log_context,
-        )
+        return default_command_prompt_template

rasa/dialogue_understanding/generator/single_step/search_ready_llm_command_generator.py

@@ -128,7 +128,20 @@ class SearchReadyLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         if prompt_template is not None:
             return prompt_template
 
-        # Get the default prompt template based on the model name.
+        # Try to load the template from the given path or fallback to the default for
+        # the component.
+        custom_prompt_template_path = config.get(PROMPT_TEMPLATE_CONFIG_KEY)
+        if custom_prompt_template_path is not None:
+            custom_prompt_template = get_prompt_template(
+                custom_prompt_template_path,
+                None,  # Default will be based on the model
+                log_source_component=log_source_component,
+                log_source_method=log_context,
+            )
+            if custom_prompt_template is not None:
+                return custom_prompt_template
+
+        # Fallback to the default prompt template based on the model.
         default_command_prompt_template = get_default_prompt_template_based_on_model(
             llm_config=config.get(LLM_CONFIG_KEY, {}) or {},
             model_prompt_mapping=cls.get_model_prompt_mapper(),
@@ -138,10 +151,4 @@ class SearchReadyLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
             log_source_method=log_context,
         )
 
-        # Return the prompt template either from the config or the default prompt.
-        return get_prompt_template(
-            config.get(PROMPT_TEMPLATE_CONFIG_KEY),
-            default_command_prompt_template,
-            log_source_component=log_source_component,
-            log_source_method=log_context,
-        )
+        return default_command_prompt_template

rasa/dialogue_understanding/processor/command_processor.py

@@ -476,6 +476,18 @@ def clean_up_commands(
         else:
             clean_commands.append(command)
 
+    # ensure that there is only one command of a certain command type
+    clean_commands = ensure_max_number_of_command_type(
+        clean_commands, CannotHandleCommand, 1
+    )
+    clean_commands = ensure_max_number_of_command_type(
+        clean_commands, RepeatBotMessagesCommand, 1
+    )
+    clean_commands = ensure_max_number_of_command_type(
+        clean_commands, ChitChatAnswerCommand, 1
+    )
+
+    # filter out cannot handle commands if there are other commands present
     # when coexistence is enabled, by default there will be a SetSlotCommand
     # for the ROUTE_TO_CALM_SLOT slot.
     if tracker.has_coexistence_routing_slot and len(clean_commands) > 2:
@@ -483,9 +495,6 @@ def clean_up_commands(
     elif not tracker.has_coexistence_routing_slot and len(clean_commands) > 1:
         clean_commands = filter_cannot_handle_command(clean_commands)
 
-    clean_commands = ensure_max_number_of_command_type(
-        clean_commands, RepeatBotMessagesCommand, 1
-    )
     structlogger.debug(
         "command_processor.clean_up_commands.final_commands",
         command=clean_commands,

rasa/e2e_test/e2e_config.py

@@ -72,9 +72,10 @@ class LLMJudgeConfig(BaseModel):
 
         llm_config = resolve_model_client_config(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()
-        )
+        if not 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

rasa/model_manager/socket_bridge.py

@@ -2,8 +2,7 @@ import json
 from typing import Any, Dict, Optional
 
 import structlog
-from socketio import AsyncServer
-from socketio.asyncio_client import AsyncClient
+from socketio import AsyncClient, AsyncServer  # type: ignore[attr-defined]
 from socketio.exceptions import ConnectionRefusedError
 
 from rasa.model_manager.runner_service import BotSession