rasa-pro 3.14.0rc4__py3-none-any.whl → 3.14.2__py3-none-any.whl

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/agent.py

@@ -297,7 +297,10 @@ async def load_agent(
         return agent
 
     except AgentInitializationException as e:
-        raise e
+        if e.suppress_stack_trace:
+            raise e from None
+        else:
+            raise e
     except Exception as e:
         logger.error(f"Could not load model due to {e}.", exc_info=True)
         return agent

rasa/core/available_agents.py

@@ -114,7 +114,7 @@ class AvailableAgents:
             else:
                 # We are using the default folder, it may not be created yet
                 # Init with an empty agents in this case
-                structlogger.info(
+                structlogger.debug(
                     f"Default agents config folder '{sub_agents_folder}' does not "
                     f"exist. Agent configurations won't be loaded."
                 )

rasa/core/channels/voice_stream/browser_audio.py

@@ -90,13 +90,13 @@ class BrowserAudioInputChannel(VoiceInputChannel):
         self._wav_file: Optional[wave.Wave_write] = None
 
     def _start_recording(self, call_id: str, user_id: str) -> None:
+        if not self._recording_enabled:
+            return
+
         os.makedirs("recordings", exist_ok=True)
         filename = f"{user_id}_{call_id}.wav"
         file_path = os.path.join("recordings", filename)
 
-        if not self._recording_enabled:
-            return
-
         self._wav_file = wave.open(file_path, "wb")
         self._wav_file.setnchannels(1)  # Mono audio
         self._wav_file.setsampwidth(4)  # 32-bit audio (4 bytes)

rasa/core/channels/voice_stream/voice_channel.py

@@ -192,6 +192,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
+        VoiceInputChannel._cancel_silence_timeout_watcher()
         await self.send_marker_message(recipient_id)
 
     async def send_intermediate_marker(self, recipient_id: str) -> None:
@@ -268,11 +270,6 @@ class VoiceOutputChannel(OutputChannel):
         # Track TTS start time
         call_state.tts_start_time = time.time()
 
-        cached_audio_bytes = self.tts_cache.get(text)
-        collected_audio_bytes = RasaAudioBytes(b"")
-        seconds_marker = -1
-        last_sent_offset = 0
-        first_audio_sent = False
         logger.debug("voice_channel.sending_audio", text=text)
 
         # Send start marker before first chunk
@@ -285,17 +282,12 @@ class VoiceOutputChannel(OutputChannel):
         allow_interruptions = kwargs.get("allow_interruptions", True)
         call_state.channel_data["allow_interruptions"] = allow_interruptions
 
-        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
+        first_audio_sent = False
+        seconds_marker = -1
         async for audio_bytes in audio_stream:
             collected_audio_bytes = RasaAudioBytes(collected_audio_bytes + audio_bytes)
 
@@ -315,6 +307,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)
@@ -348,7 +342,7 @@ class VoiceOutputChannel(OutputChannel):
             pass
         call_state.latest_bot_audio_id = self.latest_message_id
 
-        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(
@@ -373,6 +367,22 @@ class VoiceOutputChannel(OutputChannel):
     async def hangup(self, recipient_id: str, **kwargs: Any) -> None:
         call_state.should_hangup = True
 
+    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.
@@ -555,7 +565,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/config/credentials.py

@@ -5,11 +5,11 @@ from typing import Any, Dict
 
 from rasa.shared.utils.yaml import read_config_file
 
+ChannelsType = Dict[str, Dict[str, Any]]
+
 
 class CredentialsConfig:
-    def __init__(
-        self, channels: Dict[str, Dict[str, Any]], config_file_path: Path
-    ) -> None:
+    def __init__(self, channels: ChannelsType, config_file_path: Path) -> None:
         self.channels = channels
         self.config_file_path = config_file_path
 

rasa/core/exceptions.py

@@ -14,7 +14,7 @@ class AgentNotReady(RasaCoreException):
     def __init__(self, message: Text) -> None:
         """Initialize message attribute."""
         self.message = message
-        super(AgentNotReady, self).__init__()
+        super(AgentNotReady, self).__init__(message)
 
 
 class ChannelConfigError(RasaCoreException):

rasa/core/featurizers/tracker_featurizers.py

@@ -58,7 +58,7 @@ class InvalidStory(RasaException):
           message: a custom exception message.
         """
         self.message = message
-        super(InvalidStory, self).__init__()
+        super(InvalidStory, self).__init__(message)
 
     def __str__(self) -> Text:
         return self.message
@@ -174,6 +174,7 @@ class TrackerFeaturizer:
 
         Args:
             trackers_as_actions: A list of tracker labels.
+            domain: The domain containing action names.
 
         Returns:
             Label IDs for each tracker
@@ -854,7 +855,7 @@ class MaxHistoryTrackerFeaturizer(TrackerFeaturizer):
         """Creates an iterator over training examples from a tracker.
 
         Args:
-            trackers: The tracker from which to extract training examples.
+            tracker: The tracker from which to extract training examples.
             domain: The domain of the training data.
             omit_unset_slots: If `True` do not include the initial values of slots.
             ignore_action_unlikely_intent: Whether to remove `action_unlikely_intent`

rasa/core/persistor.py

@@ -314,7 +314,7 @@ class AWSPersistor(Persistor):
             obj = self.s3.Object(self.bucket_name, model_path)
             return obj.content_length
         except Exception:
-            raise ModelNotFound()
+            raise ModelNotFound("Model not found")
 
     def _retrieve_tar(
         self, target_filename: str, target_path: Optional[str] = None
@@ -349,7 +349,7 @@ class AWSPersistor(Persistor):
                     target_filename=target_filename,
                     event_info=log,
                 )
-                raise ModelNotFound() from exc
+                raise ModelNotFound("Model not found") from exc
         except exceptions.BotoCoreError as exc:
             structlogger.error(
                 "aws_persistor.retrieve_tar.model_download_error",
@@ -357,7 +357,7 @@ class AWSPersistor(Persistor):
                 target_filename=target_filename,
                 event_info=log,
             )
-            raise ModelNotFound() from exc
+            raise ModelNotFound("Model not found") from exc
 
 
 class GCSPersistor(Persistor):
@@ -447,7 +447,7 @@ class GCSPersistor(Persistor):
             blob = self.bucket.blob(target_filename)
             return blob.size
         except Exception:
-            raise ModelNotFound()
+            raise ModelNotFound("Model not found")
 
     def _retrieve_tar(
         self, target_filename: str, target_path: Optional[str] = None
@@ -481,7 +481,7 @@ class GCSPersistor(Persistor):
                 target_filename=target_filename,
                 event_info=log,
             )
-            raise ModelNotFound() from exc
+            raise ModelNotFound("Model not found") from exc
 
 
 class AzurePersistor(Persistor):
@@ -534,7 +534,7 @@ class AzurePersistor(Persistor):
             properties = blob_client.get_blob_properties()
             return properties.size
         except Exception:
-            raise ModelNotFound()
+            raise ModelNotFound("Model not found")
 
     def _retrieve_tar(
         self, target_filename: Text, target_path: Optional[str] = None
@@ -570,4 +570,4 @@ class AzurePersistor(Persistor):
                 event_info=log,
                 exception=exc,
             )
-            raise ModelNotFound() from exc
+            raise ModelNotFound("Model not found") from exc