rasa-pro 3.11.5__py3-none-any.whl → 3.11.7__py3-none-any.whl

rasa/core/brokers/kafka.py

@@ -12,6 +12,7 @@ import time
 
 from rasa.core.brokers.broker import EventBroker
 from rasa.core.exceptions import KafkaProducerInitializationError
+from rasa.shared.core.events import ErrorHandled
 from rasa.shared.utils.io import DEFAULT_ENCODING
 from rasa.utils.endpoints import EndpointConfig
 import rasa.shared.utils.common
@@ -119,7 +120,7 @@ class KafkaEventBroker(EventBroker):
         retry_delay_in_seconds: float = 5,
     ) -> None:
         """Publishes events."""
-        from confluent_kafka import KafkaException
+        from confluent_kafka import KafkaError, KafkaException
 
         if retries == 1:
             retries = 2
@@ -143,28 +144,66 @@ class KafkaEventBroker(EventBroker):
                 )
                 self.producer.poll(1)
                 retries -= 1
-            except Exception as e:
-                logger.error(
-                    f"Could not publish message to kafka url '{self.url}'. "
-                    f"Failed with error: {e}"
-                )
-                try:
-                    self._check_kafka_connection()
-                except KafkaException:
-                    logger.debug("Connection to kafka lost, reconnecting...")
-                    self.producer = self._create_producer()
-                    try:
-                        self._check_kafka_connection()
-                        logger.debug("Reconnection to kafka successful")
-                        self._publish(event)
-                        return
-                    except KafkaException:
-                        pass
-                retries -= 1
-                time.sleep(retry_delay_in_seconds)
+            except Exception as exc:
+                if (
+                    isinstance(exc, KafkaException)
+                    and exc.args[0].code() == KafkaError.MSG_SIZE_TOO_LARGE
+                ):
+                    logger.warning(
+                        "Message size is too large for the Kafka broker. "
+                        "Please check the message.max.bytes configuration. "
+                        "Sending error event."
+                    )
+
+                    original_event_type = event.get("event", "")
+                    sender_id = event.get("sender_id", "")
+                    event = ErrorHandled(
+                        error_code=KafkaError.MSG_SIZE_TOO_LARGE,
+                        metadata={
+                            "error_msg": f"Skipping message for event type "
+                            f"'{original_event_type}' because "
+                            f"of Kafka message size limit: {exc.args[0].str()}.",
+                            "error_source": "KafkaEventBroker",
+                        },
+                    ).as_dict()
+                    event.update({"sender_id": sender_id})
+                else:
+                    logger.error(
+                        f"Could not publish message to kafka url '{self.url}'. "
+                        f"Failed with error: {exc}"
+                    )
+                self._retry_publish(event, retries, retry_delay_in_seconds)
 
         logger.error("Failed to publish Kafka event.")
 
+    def _retry_publish(
+        self,
+        event: Dict[Text, Any],
+        retries: int,
+        retry_delay_in_seconds: float,
+    ) -> None:
+        """Retries publishing if the producer is not connected.
+
+        Args:
+            event: The event to publish.
+        """
+        from confluent_kafka import KafkaException
+
+        try:
+            self._check_kafka_connection()
+        except KafkaException:
+            logger.debug("Connection to kafka lost, reconnecting...")
+            self.producer = self._create_producer()
+            try:
+                self._check_kafka_connection()
+                logger.debug("Reconnection to kafka successful")
+                self._publish(event)
+                return
+            except KafkaException:
+                pass
+        retries -= 1
+        time.sleep(retry_delay_in_seconds)
+
     def _check_kafka_connection(self) -> None:
         """Verifies connection with Kafka.
 

rasa/core/channels/voice_ready/audiocodes.py

@@ -1,28 +1,29 @@
 import asyncio
 import copy
-from datetime import datetime, timezone, timedelta
+import hmac
 import json
 import uuid
 from collections import defaultdict
 from dataclasses import asdict
+from datetime import datetime, timedelta, timezone
 from typing import Any, Awaitable, Callable, Dict, List, Optional, Set, Text, Union
 
 import structlog
 from jsonschema import ValidationError, validate
+from sanic import Blueprint, response
+from sanic.exceptions import NotFound, SanicException, ServerError
+from sanic.request import Request
+from sanic.response import HTTPResponse
+
 from rasa.core import jobs
 from rasa.core.channels.channel import InputChannel, OutputChannel, UserMessage
 from rasa.core.channels.voice_ready.utils import (
-    validate_voice_license_scope,
     CallParameters,
+    validate_voice_license_scope,
 )
 from rasa.shared.constants import INTENT_MESSAGE_PREFIX
 from rasa.shared.core.constants import USER_INTENT_SESSION_START
 from rasa.shared.exceptions import RasaException
-from sanic import Blueprint, response
-from sanic.exceptions import NotFound, SanicException, ServerError
-from sanic.request import Request
-from sanic.response import HTTPResponse
-
 from rasa.utils.io import remove_emojis
 
 structlogger = structlog.get_logger()
@@ -114,11 +115,21 @@ class Conversation:
     async def handle_activities(
         self,
         message: Dict[Text, Any],
+        input_channel_name: str,
         output_channel: OutputChannel,
         on_new_message: Callable[[UserMessage], Awaitable[Any]],
     ) -> None:
         """Handle activities sent by Audiocodes."""
         structlogger.debug("audiocodes.handle.activities")
+        if input_channel_name == "":
+            structlogger.warning(
+                "audiocodes.handle.activities.empty_input_channel_name",
+                event_info=(
+                    f"Audiocodes input channel name is empty "
+                    f"for conversation {self.conversation_id}"
+                ),
+            )
+
         for activity in message["activities"]:
             text = None
             if activity[ACTIVITY_ID_KEY] in self.activity_ids:
@@ -142,6 +153,7 @@ class Conversation:
             metadata = self.get_metadata(activity)
             user_msg = UserMessage(
                 text=text,
+                input_channel=input_channel_name,
                 output_channel=output_channel,
                 sender_id=self.conversation_id,
                 metadata=metadata,
@@ -246,6 +258,9 @@ class AudiocodesInput(InputChannel):
     def _check_token(self, token: Optional[Text]) -> None:
         if not token:
             raise HttpUnauthorized("Authentication token required.")
+        if not hmac.compare_digest(str(token), str(self.token)):
+            structlogger.error("audiocodes.invalid_token", invalid_token=token)
+            raise HttpUnauthorized("Invalid authentication token.")
 
     def _get_conversation(
         self, token: Optional[Text], conversation_id: Text
@@ -388,7 +403,12 @@ class AudiocodesInput(InputChannel):
             # start a background task to handle activities
             self._create_task(
                 conversation_id,
-                conversation.handle_activities(request.json, ac_output, on_new_message),
+                conversation.handle_activities(
+                    request.json,
+                    input_channel_name=self.name(),
+                    output_channel=ac_output,
+                    on_new_message=on_new_message,
+                ),
             )
             return response.json(response_json)
 
@@ -401,23 +421,9 @@ class AudiocodesInput(InputChannel):
             Example of payload:
             {"conversation": <conversation_id>, "reason": Optional[Text]}.
             """
-            self._get_conversation(request.token, conversation_id)
-            reason = {"reason": request.json.get("reason")}
-            await on_new_message(
-                UserMessage(
-                    text=f"{INTENT_MESSAGE_PREFIX}session_end",
-                    output_channel=None,
-                    sender_id=conversation_id,
-                    metadata=reason,
-                )
+            return await self._handle_disconnect(
+                request, conversation_id, on_new_message
             )
-            del self.conversations[conversation_id]
-            structlogger.debug(
-                "audiocodes.disconnect",
-                conversation=conversation_id,
-                request=request.json,
-            )
-            return response.json({})
 
         @ac_webhook.route("/conversation/<conversation_id>/keepalive", methods=["POST"])
         async def keepalive(request: Request, conversation_id: Text) -> HTTPResponse:
@@ -432,6 +438,32 @@ class AudiocodesInput(InputChannel):
 
         return ac_webhook
 
+    async def _handle_disconnect(
+        self,
+        request: Request,
+        conversation_id: Text,
+        on_new_message: Callable[[UserMessage], Awaitable[Any]],
+    ) -> HTTPResponse:
+        """Triggered when the call is disconnected."""
+        self._get_conversation(request.token, conversation_id)
+        reason = {"reason": request.json.get("reason")}
+        await on_new_message(
+            UserMessage(
+                text=f"{INTENT_MESSAGE_PREFIX}session_end",
+                input_channel=self.name(),
+                output_channel=None,
+                sender_id=conversation_id,
+                metadata=reason,
+            )
+        )
+        del self.conversations[conversation_id]
+        structlogger.debug(
+            "audiocodes.disconnect",
+            conversation=conversation_id,
+            request=request.json,
+        )
+        return response.json({})
+
 
 class AudiocodesOutput(OutputChannel):
     @classmethod
@@ -439,6 +471,7 @@ class AudiocodesOutput(OutputChannel):
         return CHANNEL_NAME
 
     def __init__(self) -> None:
+        super().__init__()
         self.messages: List[Dict] = []
 
     async def add_message(self, message: Dict) -> None:

rasa/core/channels/voice_stream/asr/deepgram.py

@@ -1,7 +1,8 @@
-from dataclasses import dataclass
-from typing import Any, Dict, Optional
 import json
 import os
+from dataclasses import dataclass
+from typing import Any, Dict, Optional
+from urllib.parse import urlencode
 
 import websockets
 from websockets.legacy.client import WebSocketClientProtocol
@@ -19,11 +20,14 @@ from rasa.shared.constants import DEEPGRAM_API_KEY_ENV_VAR
 @dataclass
 class DeepgramASRConfig(ASREngineConfig):
     endpoint: Optional[str] = None
-    # number of miliseconds of silence to determine end of speech
+    # number of milliseconds of silence to determine end of speech
     endpointing: Optional[int] = None
     language: Optional[str] = None
     model: Optional[str] = None
     smart_format: Optional[bool] = None
+    # number of milliseconds of no new transcript to determine end of speech
+    # should be at least 1000 according to docs
+    utterance_end_ms: Optional[int] = None
 
 
 class DeepgramASR(ASREngine[DeepgramASRConfig]):
@@ -37,22 +41,35 @@ class DeepgramASR(ASREngine[DeepgramASRConfig]):
         """Connect to the ASR system."""
         deepgram_api_key = os.environ[DEEPGRAM_API_KEY_ENV_VAR]
         extra_headers = {"Authorization": f"Token {deepgram_api_key}"}
-        api_url = self._get_api_url()
-        query_params = self._get_query_params()
         return await websockets.connect(  # type: ignore
-            api_url + query_params,
+            self._get_api_url_with_query_params(),
             extra_headers=extra_headers,
         )
 
+    def _get_api_url_with_query_params(self) -> str:
+        """Combine api url and query params."""
+        return self._get_api_url() + self._get_query_params()
+
     def _get_api_url(self) -> str:
+        """Get the api url with the configured endpoint."""
         return f"wss://{self.config.endpoint}/v1/listen?"
 
     def _get_query_params(self) -> str:
-        return (
-            f"encoding=mulaw&sample_rate={HERTZ}&endpointing={self.config.endpointing}"
-            f"&vad_events=true&language={self.config.language}&interim_results=true"
-            f"&model={self.config.model}&smart_format={str(self.config.smart_format).lower()}"
-        )
+        """Get the configured query parameters for the api."""
+        query_params = {
+            "encoding": "mulaw",
+            "sample_rate": HERTZ,
+            "endpointing": self.config.endpointing,
+            "vad_events": "true",
+            "language": self.config.language,
+            "interim_results": "true",
+            "model": self.config.model,
+            "smart_format": str(self.config.smart_format).lower(),
+        }
+        if self.config.utterance_end_ms and self.config.utterance_end_ms > 0:
+            query_params["utterance_end_ms"] = self.config.utterance_end_ms
+
+        return urlencode(query_params)
 
     async def signal_audio_done(self) -> None:
         """Signal to the ASR Api that you are done sending data."""
@@ -67,24 +84,48 @@ class DeepgramASR(ASREngine[DeepgramASRConfig]):
     def engine_event_to_asr_event(self, e: Any) -> Optional[ASREvent]:
         """Translate an engine event to a common ASREvent."""
         data = json.loads(e)
-        if "is_final" in data:
-            transcript = data["channel"]["alternatives"][0]["transcript"]
+        data_type = data["type"]
+        if data_type == "Results":
+            transcript_data = data["channel"]["alternatives"][0]
+            transcript = transcript_data["transcript"]
             if data["is_final"]:
                 if data.get("speech_final"):
-                    full_transcript = self.accumulated_transcript + transcript
+                    full_transcript = self.concatenate_transcripts(
+                        self.accumulated_transcript, transcript
+                    )
                     self.accumulated_transcript = ""
                     if full_transcript:
                         return NewTranscript(full_transcript)
                 else:
-                    self.accumulated_transcript += transcript
+                    self.accumulated_transcript = self.concatenate_transcripts(
+                        self.accumulated_transcript, transcript
+                    )
             elif transcript:
                 return UserIsSpeaking()
+        # event that comes after utterance_end_ms of no new transcript
+        elif data_type == "UtteranceEnd":
+            if self.accumulated_transcript:
+                transcript = self.accumulated_transcript
+                self.accumulated_transcript = ""
+                return NewTranscript(transcript)
         return None
 
     @staticmethod
     def get_default_config() -> DeepgramASRConfig:
-        return DeepgramASRConfig("api.deepgram.com", 400, "en", "nova-2-general", True)
+        return DeepgramASRConfig(
+            endpoint="api.deepgram.com",
+            endpointing=400,
+            language="en",
+            model="nova-2-general",
+            smart_format=True,
+            utterance_end_ms=1000,
+        )
 
     @classmethod
     def from_config_dict(cls, config: Dict) -> "DeepgramASR":
         return DeepgramASR(DeepgramASRConfig.from_dict(config))
+
+    @staticmethod
+    def concatenate_transcripts(t1: str, t2: str) -> str:
+        """Concatenate two transcripts making sure there is a space between them."""
+        return (t1.strip() + " " + t2.strip()).strip()

rasa/core/channels/voice_stream/browser_audio.py

@@ -102,6 +102,9 @@ class BrowserAudioInputChannel(VoiceInputChannel):
 
         @blueprint.websocket("/websocket")  # type: ignore
         async def handle_message(request: Request, ws: Websocket) -> None:
-            await self.run_audio_streaming(on_new_message, ws)
+            try:
+                await self.run_audio_streaming(on_new_message, ws)
+            except Exception as e:
+                logger.error("browser_audio.handle_message.error", error=e)
 
         return blueprint

rasa/core/channels/voice_stream/tts/cartesia.py

@@ -87,13 +87,22 @@ class CartesiaTTS(TTSEngine[CartesiaTTSConfig]):
                     async for data in response.content.iter_chunked(1024):
                         yield self.engine_bytes_to_rasa_audio_bytes(data)
                     return
+                elif response.status == 401:
+                    structlogger.error(
+                        "cartesia.synthesize.rest.unauthorized",
+                        status_code=response.status,
+                    )
+                    raise TTSError(
+                        "Unauthorized. Please make sure you have the correct API key."
+                    )
                 else:
+                    response_text = await response.text()
                     structlogger.error(
                         "cartesia.synthesize.rest.failed",
                         status_code=response.status,
-                        msg=response.text(),
+                        msg=response_text,
                     )
-                    raise TTSError(f"TTS failed: {response.text()}")
+                    raise TTSError(f"TTS failed: {response_text}")
         except ClientConnectorError as e:
             raise TTSError(e)
         except TimeoutError as e:

rasa/core/policies/enterprise_search_prompt_with_citation_template.jinja2

@@ -4,7 +4,7 @@ If the answer is not known or cannot be determined from the provided documents o
 Use the following documents to answer the question:
 {% for doc in docs %}
 {{ loop.cycle("*")}}. {{ doc.metadata }}
-{{ doc.page_content }}
+{{ doc.text }}
 {% endfor %}
 
 {% if citation_enabled %}

rasa/core/policies/intentless_policy.py

@@ -1,7 +1,7 @@
 import importlib.resources
 import math
 from dataclasses import dataclass, field
-from typing import Any, Dict, List, Optional, Set, TYPE_CHECKING, Text, Tuple
+from typing import Any, Dict, List, Optional, TYPE_CHECKING, Text, Tuple
 
 import structlog
 import tiktoken
@@ -18,7 +18,6 @@ from rasa.core.constants import (
     UTTER_SOURCE_METADATA_KEY,
 )
 from rasa.core.policies.policy import Policy, PolicyPrediction, SupportedData
-from rasa.dialogue_understanding.patterns.chitchat import FLOW_PATTERN_CHITCHAT
 from rasa.dialogue_understanding.stack.frames import (
     ChitChatStackFrame,
     DialogueStackFrame,
@@ -30,7 +29,6 @@ from rasa.engine.storage.storage import ModelStorage
 from rasa.graph_components.providers.forms_provider import Forms
 from rasa.graph_components.providers.responses_provider import Responses
 from rasa.shared.constants import (
-    REQUIRED_SLOTS_KEY,
     EMBEDDINGS_CONFIG_KEY,
     LLM_CONFIG_KEY,
     MODEL_CONFIG_KEY,
@@ -42,7 +40,6 @@ from rasa.shared.constants import (
     MODEL_GROUP_ID_CONFIG_KEY,
 )
 from rasa.shared.core.constants import ACTION_LISTEN_NAME
-from rasa.shared.core.constants import ACTION_TRIGGER_CHITCHAT
 from rasa.shared.core.domain import KEY_RESPONSES_TEXT, Domain
 from rasa.shared.core.events import (
     ActionExecuted,
@@ -52,6 +49,7 @@ from rasa.shared.core.events import (
 )
 from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.generator import TrackerWithCachedStates
+from rasa.shared.core.policies.utils import filter_responses_for_intentless_policy
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.exceptions import FileIOException, RasaCoreException
 from rasa.shared.nlu.constants import PREDICTED_CONFIDENCE_KEY
@@ -147,59 +145,6 @@ class Conversation:
     interactions: List[Interaction] = field(default_factory=list)
 
 
-def collect_form_responses(forms: Forms) -> Set[Text]:
-    """Collect responses that belong the requested slots in forms.
-
-    Args:
-        forms: the forms from the domain
-    Returns:
-        all utterances used in forms
-    """
-    form_responses = set()
-    for _, form_info in forms.data.items():
-        for required_slot in form_info.get(REQUIRED_SLOTS_KEY, []):
-            form_responses.add(f"utter_ask_{required_slot}")
-    return form_responses
-
-
-def filter_responses(responses: Responses, forms: Forms, flows: FlowsList) -> Responses:
-    """Filters out responses that are unwanted for the intentless policy.
-
-    This includes utterances used in flows and forms.
-
-    Args:
-        responses: the responses from the domain
-        forms: the forms from the domain
-        flows: all flows
-    Returns:
-        The remaining, relevant responses for the intentless policy.
-    """
-    form_responses = collect_form_responses(forms)
-    flow_responses = flows.utterances
-    combined_responses = form_responses | flow_responses
-    filtered_responses = {
-        name: variants
-        for name, variants in responses.data.items()
-        if name not in combined_responses
-    }
-
-    pattern_chitchat = flows.flow_by_id(FLOW_PATTERN_CHITCHAT)
-
-    # The following condition is highly unlikely, but mypy requires the case
-    # of pattern_chitchat == None to be addressed
-    if not pattern_chitchat:
-        return Responses(data=filtered_responses)
-
-    # if action_trigger_chitchat, filter out "utter_free_chitchat_response"
-    has_action_trigger_chitchat = pattern_chitchat.has_action_step(
-        ACTION_TRIGGER_CHITCHAT
-    )
-    if has_action_trigger_chitchat:
-        filtered_responses.pop("utter_free_chitchat_response", None)
-
-    return Responses(data=filtered_responses)
-
-
 def action_from_response(
     text: Optional[str], responses: Dict[Text, List[Dict[Text, Any]]]
 ) -> Optional[str]:
@@ -513,7 +458,9 @@ class IntentlessPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Policy):
         # Perform health checks of both LLM and embeddings client configs
         self._perform_health_checks(self.config, "intentless_policy.train")
 
-        responses = filter_responses(responses, forms, flows or FlowsList([]))
+        responses = filter_responses_for_intentless_policy(
+            responses, forms, flows or FlowsList([])
+        )
         telemetry.track_intentless_policy_train()
         response_texts = [r for r in extract_ai_response_examples(responses.data)]
 
@@ -948,7 +895,6 @@ class IntentlessPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Policy):
         **kwargs: Any,
     ) -> "IntentlessPolicy":
         """Loads a trained policy (see parent class for full docstring)."""
-
         # Perform health checks of both LLM and embeddings client configs
         cls._perform_health_checks(config, "intentless_policy.load")
 

rasa/dialogue_understanding/generator/nlu_command_adapter.py

@@ -139,7 +139,7 @@ class NLUCommandAdapter(GraphComponent, CommandGenerator):
 
         if commands:
             commands = clean_up_commands(
-                commands, tracker, flows, self._execution_context
+                commands, tracker, flows, self._execution_context, domain
             )
             log_llm(
                 logger=structlogger,

rasa/dialogue_understanding/processor/command_processor.py

@@ -41,9 +41,11 @@ from rasa.shared.constants import (
 )
 from rasa.shared.core.constants import ACTION_TRIGGER_CHITCHAT, SlotMappingType
 from rasa.shared.core.constants import FLOW_HASHES_SLOT
+from rasa.shared.core.domain import Domain
 from rasa.shared.core.events import Event, SlotSet
 from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.flows.steps.collect import CollectInformationFlowStep
+from rasa.shared.core.policies.utils import contains_intentless_policy_responses
 from rasa.shared.core.slots import Slot
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.nlu.constants import COMMANDS
@@ -182,6 +184,7 @@ def execute_commands(
     all_flows: FlowsList,
     execution_context: ExecutionContext,
     story_graph: Optional[StoryGraph] = None,
+    domain: Optional[Domain] = None,
 ) -> List[Event]:
     """Executes a list of commands.
 
@@ -191,6 +194,7 @@ def execute_commands(
         all_flows: All flows.
         execution_context: Information about the single graph run.
         story_graph: StoryGraph object with stories available for training.
+        domain: The domain of the bot.
 
     Returns:
         A list of the events that were created.
@@ -199,7 +203,7 @@ def execute_commands(
     original_tracker = tracker.copy()
 
     commands = clean_up_commands(
-        commands, tracker, all_flows, execution_context, story_graph
+        commands, tracker, all_flows, execution_context, story_graph, domain
     )
 
     updated_flows = find_updated_flows(tracker, all_flows)
@@ -333,6 +337,7 @@ def clean_up_commands(
     all_flows: FlowsList,
     execution_context: ExecutionContext,
     story_graph: Optional[StoryGraph] = None,
+    domain: Optional[Domain] = None,
 ) -> List[Command]:
     """Clean up a list of commands.
 
@@ -348,10 +353,13 @@ def clean_up_commands(
         all_flows: All flows.
         execution_context: Information about a single graph run.
         story_graph: StoryGraph object with stories available for training.
+        domain: The domain of the bot.
 
     Returns:
     The cleaned up commands.
     """
+    domain = domain if domain else Domain.empty()
+
     slots_so_far, active_flow = filled_slots_for_active_flow(tracker, all_flows)
 
     clean_commands: List[Command] = []
@@ -394,7 +402,12 @@ def clean_up_commands(
         # handle chitchat command differently from other free-form answer commands
         elif isinstance(command, ChitChatAnswerCommand):
             clean_commands = clean_up_chitchat_command(
-                clean_commands, command, all_flows, execution_context, story_graph
+                clean_commands,
+                command,
+                all_flows,
+                execution_context,
+                domain,
+                story_graph,
             )
 
         elif isinstance(command, FreeFormAnswerCommand):
@@ -590,6 +603,7 @@ def clean_up_chitchat_command(
     command: ChitChatAnswerCommand,
     flows: FlowsList,
     execution_context: ExecutionContext,
+    domain: Domain,
     story_graph: Optional[StoryGraph] = None,
 ) -> List[Command]:
     """Clean up a chitchat answer command.
@@ -603,6 +617,8 @@ def clean_up_chitchat_command(
         flows: All flows.
         execution_context: Information about a single graph run.
         story_graph: StoryGraph object with stories available for training.
+        domain: The domain of the bot.
+
     Returns:
         The cleaned up commands.
     """
@@ -628,10 +644,9 @@ def clean_up_chitchat_command(
     )
     defines_intentless_policy = execution_context.has_node(IntentlessPolicy)
 
-    has_e2e_stories = True if (story_graph and story_graph.has_e2e_stories()) else False
-
     if (has_action_trigger_chitchat and not defines_intentless_policy) or (
-        defines_intentless_policy and not has_e2e_stories
+        defines_intentless_policy
+        and not contains_intentless_policy_responses(flows, domain, story_graph)
     ):
         resulting_commands.insert(
             0, CannotHandleCommand(RASA_PATTERN_CANNOT_HANDLE_CHITCHAT)