rasa-pro 3.13.10__tar.gz → 3.13.11__tar.gz

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.10
+Version: 3.13.11
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
 Author: Rasa Technologies GmbH

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.13.10"
+version = "3.13.11"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
@@ -387,6 +387,7 @@ convention = "google"
 
 
 
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/core/actions/action.py

@@ -23,11 +23,9 @@ from rasa.core.constants import (
     KEY_IS_COEXISTENCE_ASSISTANT,
     UTTER_SOURCE_METADATA_KEY,
 )
-from rasa.core.nlg.translate import get_translated_buttons, get_translated_text
 from rasa.core.policies.policy import PolicyPrediction
 from rasa.core.utils import add_bot_utterance_metadata
 from rasa.e2e_test.constants import KEY_STUB_CUSTOM_ACTIONS
-from rasa.engine.language import Language
 from rasa.nlu.constants import (
     RESPONSE_SELECTOR_DEFAULT_INTENT,
     RESPONSE_SELECTOR_PREDICTION_KEY,
@@ -84,7 +82,6 @@ from rasa.shared.core.events import (
     UserUttered,
 )
 from rasa.shared.core.flows import FlowsList
-from rasa.shared.core.flows.constants import KEY_TRANSLATION
 from rasa.shared.core.slot_mappings import (
     SlotFillingManager,
     extract_slot_value,
@@ -251,36 +248,25 @@ def action_for_name_or_text(
     return RemoteAction(action_name_or_text, action_endpoint)
 
 
-def create_bot_utterance(
-    message: Dict[Text, Any], language: Optional[Language] = None
-) -> BotUttered:
-    """Create BotUttered event from message with translation support."""
-    message_copy = copy.deepcopy(message)
-
-    text = get_translated_text(
-        text=message_copy.pop(TEXT, None),
-        translation=message_copy.pop(KEY_TRANSLATION, {}),
-        language=language,
-    )
-
-    buttons = get_translated_buttons(
-        buttons=message_copy.pop(BUTTONS, None), language=language
+def create_bot_utterance(message: Dict[Text, Any]) -> BotUttered:
+    """Create BotUttered event from message."""
+    bot_message = BotUttered(
+        text=message.pop(TEXT, None),
+        data={
+            ELEMENTS: message.pop(ELEMENTS, None),
+            QUICK_REPLIES: message.pop(QUICK_REPLIES, None),
+            BUTTONS: message.pop(BUTTONS, None),
+            # for legacy / compatibility reasons we need to set the image
+            # to be the attachment if there is no other attachment (the
+            # `.get` is intentional - no `pop` as we still need the image`
+            # property to set it in the following line)
+            ATTACHMENT: message.pop(ATTACHMENT, None) or message.get(IMAGE, None),
+            IMAGE: message.pop(IMAGE, None),
+            CUSTOM: message.pop(CUSTOM, None),
+        },
+        metadata=message,
     )
-
-    data = {
-        ELEMENTS: message_copy.pop(ELEMENTS, None),
-        QUICK_REPLIES: message_copy.pop(QUICK_REPLIES, None),
-        BUTTONS: buttons,
-        # for legacy / compatibility reasons we need to set the image
-        # to be the attachment if there is no other attachment (the
-        # `.get` is intentional - no `pop` as we still need the image`
-        # property to set it in the following line)
-        ATTACHMENT: message_copy.pop(ATTACHMENT, None) or message_copy.get(IMAGE, None),
-        IMAGE: message_copy.pop(IMAGE, None),
-        CUSTOM: message_copy.pop(CUSTOM, None),
-    }
-
-    return BotUttered(text=text, data=data, metadata=message_copy)
+    return bot_message
 
 
 class Action:
@@ -393,7 +379,7 @@ class ActionBotResponse(Action):
         message = add_bot_utterance_metadata(
             message, self.utter_action, nlg, domain, tracker
         )
-        return [create_bot_utterance(message, tracker.current_language)]
+        return [create_bot_utterance(message)]
 
     def name(self) -> Text:
         """Returns action name."""
@@ -427,7 +413,7 @@ class ActionEndToEndResponse(Action):
     ) -> List[Event]:
         """Runs action (see parent class for full docstring)."""
         message = {"text": self.action_text}
-        return [create_bot_utterance(message, tracker.current_language)]
+        return [create_bot_utterance(message)]
 
     def event_for_successful_execution(
         self,
@@ -893,7 +879,10 @@ class RemoteAction(Action):
             generated_response = response.pop("response", None)
             if generated_response is not None:
                 draft = await nlg.generate(
-                    generated_response, tracker, output_channel.name(), **response
+                    generated_response,
+                    tracker,
+                    output_channel.name(),
+                    **response,
                 )
                 if not draft:
                     continue
@@ -910,8 +899,8 @@ class RemoteAction(Action):
 
             # Avoid overwriting `draft` values with empty values
             response = {k: v for k, v in response.items() if v}
-            response.update(draft)
-            bot_messages.append(create_bot_utterance(response))
+            draft.update(response)
+            bot_messages.append(create_bot_utterance(draft))
 
         return bot_messages
 
@@ -1068,6 +1057,7 @@ def _revert_rephrasing_events() -> List[Event]:
     ]
 
 
+# TODO: this should be removed, e.g. it uses a hardcoded message and no translation
 class ActionDefaultAskAffirmation(Action):
     """Default implementation which asks the user to affirm his intent.
 
@@ -1119,7 +1109,7 @@ class ActionDefaultAskAffirmation(Action):
             "utter_action": self.name(),
         }
 
-        return [create_bot_utterance(message, tracker.current_language)]
+        return [create_bot_utterance(message)]
 
 
 class ActionDefaultAskRephrase(ActionBotResponse):
@@ -1155,7 +1145,7 @@ class ActionSendText(Action):
 
         should_send_text = metadata_copy.get("should_send_text", True)
         if should_send_text:
-            return [create_bot_utterance(message, tracker.current_language)]
+            return [create_bot_utterance(message)]
         return []
 
 

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/core/actions/action_run_slot_rejections.py

@@ -216,6 +216,6 @@ class ActionRunSlotRejections(Action):
             message = add_bot_utterance_metadata(
                 message, utterance, nlg, domain, tracker
             )
-            events.append(create_bot_utterance(message, tracker.current_language))
+            events.append(create_bot_utterance(message))
 
         return events

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/core/channels/studio_chat.py

@@ -32,6 +32,7 @@ from rasa.core.channels.voice_stream.voice_channel import (
     VoiceInputChannel,
     VoiceOutputChannel,
 )
+from rasa.core.exceptions import AgentNotReady
 from rasa.hooks import hookimpl
 from rasa.plugin import plugin_manager
 from rasa.shared.core.constants import ACTION_LISTEN_NAME
@@ -199,6 +200,13 @@ class StudioChatInput(SocketIOInput, VoiceInputChannel):
             metadata_key=credentials.get("metadata_key", "metadata"),
         )
 
+    async def emit(self, event: str, data: Dict, room: str) -> None:
+        """Emits an event to the websocket."""
+        if not self.sio:
+            structlogger.error("studio_chat.emit.sio_not_initialized")
+            return
+        await self.sio.emit(event, data, room=room)
+
     def _register_tracker_update_hook(self) -> None:
         plugin_manager().register(StudioTrackerUpdatePlugin(self))
 
@@ -208,10 +216,7 @@ class StudioChatInput(SocketIOInput, VoiceInputChannel):
 
     async def publish_tracker_update(self, sender_id: str, tracker_dump: Dict) -> None:
         """Publishes a tracker update notification to the websocket."""
-        if not self.sio:
-            structlogger.error("studio_chat.on_tracker_updated.sio_not_initialized")
-            return
-        await self.sio.emit("tracker", tracker_dump, room=sender_id)
+        await self.emit("tracker", tracker_dump, room=sender_id)
 
     async def on_message_proxy(
         self,
@@ -224,8 +229,15 @@ class StudioChatInput(SocketIOInput, VoiceInputChannel):
         """
         await on_new_message(message)
 
-        if not self.agent:
+        if not self.agent or not self.agent.is_ready():
             structlogger.error("studio_chat.on_message_proxy.agent_not_initialized")
+            await self.emit_error(
+                "The Rasa Pro model could not be loaded. "
+                "Please check the training and deployment logs "
+                "for more information.",
+                message.sender_id,
+                AgentNotReady("The Rasa Pro model could not be loaded."),
+            )
             return
 
         tracker = await self.agent.tracker_store.retrieve(message.sender_id)
@@ -235,6 +247,17 @@ class StudioChatInput(SocketIOInput, VoiceInputChannel):
 
         await self.on_tracker_updated(tracker)
 
+    async def emit_error(self, message: str, room: str, e: Exception) -> None:
+        await self.emit(
+            "error",
+            {
+                "message": message,
+                "error": str(e),
+                "exception": str(type(e).__name__),
+            },
+            room=room,
+        )
+
     async def handle_tracker_update(self, sid: str, data: Dict) -> None:
         from rasa.shared.core.trackers import DialogueStateTracker
 
@@ -251,21 +274,41 @@ class StudioChatInput(SocketIOInput, VoiceInputChannel):
             structlogger.error("studio_chat.sio.domain_not_initialized")
             return None
 
-        async with self.agent.lock_store.lock(data["sender_id"]):
-            tracker = DialogueStateTracker.from_dict(
-                data["sender_id"], data["events"], domain.slots
-            )
-
-            # will override an existing tracker with the same id!
-            await self.agent.tracker_store.save(tracker)
+        tracker: Optional[DialogueStateTracker] = None
 
-            processor = self.agent.processor
-            if processor and does_need_action_prediction(tracker):
-                output_channel = self.get_output_channel()
+        async with self.agent.lock_store.lock(data["sender_id"]):
+            try:
+                tracker = DialogueStateTracker.from_dict(
+                    data["sender_id"], data["events"], domain.slots
+                )
 
-                await processor._run_prediction_loop(output_channel, tracker)
+                # will override an existing tracker with the same id!
                 await self.agent.tracker_store.save(tracker)
 
+                processor = self.agent.processor
+                if processor and does_need_action_prediction(tracker):
+                    output_channel = self.get_output_channel()
+
+                    await processor._run_prediction_loop(output_channel, tracker)
+                    await self.agent.tracker_store.save(tracker)
+            except Exception as e:
+                structlogger.error(
+                    "studio_chat.sio.handle_tracker_update.error",
+                    error=e,
+                    sender_id=data["sender_id"],
+                )
+                await self.emit_error(
+                    "An error occurred while updating the conversation.",
+                    data["sender_id"],
+                    e,
+                )
+
+        if not tracker:
+            # in case the tracker couldn't be updated, we retrieve the prior
+            # version and use that to populate the update
+            tracker = await self.agent.tracker_store.get_or_create_tracker(
+                data["sender_id"]
+            )
         await self.on_tracker_updated(tracker)
 
     def channel_bytes_to_rasa_audio_bytes(self, input_bytes: bytes) -> RasaAudioBytes:
@@ -275,7 +318,7 @@ class StudioChatInput(SocketIOInput, VoiceInputChannel):
     async def collect_call_parameters(
         self, channel_websocket: "Websocket"
     ) -> Optional[CallParameters]:
-        """Voice method to collect call parameters"""
+        """Voice method to collect call parameters."""
         session_id = channel_websocket.session_id
         return CallParameters(session_id, "local", "local", stream_id=session_id)
 
@@ -305,7 +348,7 @@ class StudioChatInput(SocketIOInput, VoiceInputChannel):
     def create_output_channel(
         self, voice_websocket: "Websocket", tts_engine: TTSEngine
     ) -> VoiceOutputChannel:
-        """Create a voice output channel"""
+        """Create a voice output channel."""
         return StudioVoiceOutputChannel(
             voice_websocket,
             tts_engine,

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/core/nlg/contextual_response_rephraser.py

@@ -225,8 +225,10 @@ class ContextualResponseRephraser(
 
     @measure_llm_latency
     async def _generate_llm_response(self, prompt: str) -> Optional[LLMResponse]:
-        """Use LLM to generate a response, returning an LLMResponse object
-        containing both the generated text (choices) and metadata.
+        """Use LLM to generate a response.
+
+        Returns an LLMResponse object containing both the generated text
+        (choices) and metadata.
 
         Args:
             prompt: The prompt to send to the LLM.
@@ -412,12 +414,9 @@ class ContextualResponseRephraser(
         Returns:
             The generated response.
         """
-        filled_slots = tracker.current_slot_values()
-        stack_context = tracker.stack.current_context()
-        templated_response = self.generate_from_slots(
+        templated_response = await super().generate(
             utter_action=utter_action,
-            filled_slots=filled_slots,
-            stack_context=stack_context,
+            tracker=tracker,
             output_channel=output_channel,
             **kwargs,
         )

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/core/nlg/generator.py

@@ -6,6 +6,8 @@ from pypred import Predicate
 
 import rasa.shared.utils.common
 import rasa.shared.utils.io
+from rasa.core.nlg.translate import has_translation
+from rasa.engine.language import Language
 from rasa.shared.constants import CHANNEL, RESPONSE_CONDITION
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.trackers import DialogueStateTracker
@@ -131,11 +133,23 @@ class ResponseVariationFilter:
 
         return True
 
+    def _filter_by_language(
+        self, responses: List[Dict[Text, Any]], language: Optional[Language] = None
+    ) -> List[Dict[Text, Any]]:
+        if not language:
+            return responses
+
+        if filtered := [r for r in responses if has_translation(r, language)]:
+            return filtered
+        # if no translation is found, return the original response variations
+        return responses
+
     def responses_for_utter_action(
         self,
         utter_action: Text,
         output_channel: Text,
         filled_slots: Dict[Text, Any],
+        language: Optional[Language] = None,
     ) -> List[Dict[Text, Any]]:
         """Returns array of responses that fit the channel, action and condition."""
         # filter responses without a condition
@@ -176,16 +190,16 @@ class ResponseVariationFilter:
         )
 
         if conditional_channel:
-            return conditional_channel
+            return self._filter_by_language(conditional_channel, language)
 
         if default_channel:
-            return default_channel
+            return self._filter_by_language(default_channel, language)
 
         if conditional_no_channel:
-            return conditional_no_channel
+            return self._filter_by_language(conditional_no_channel, language)
 
         if default_no_channel:
-            return default_no_channel
+            return self._filter_by_language(default_no_channel, language)
 
         # if there is no response variation selected,
         # return the internal error response to prevent
@@ -198,7 +212,9 @@ class ResponseVariationFilter:
             f"a default variation and that all the conditions are valid. "
             f"Returning the internal error response.",
         )
-        return self.responses.get("utter_internal_error_rasa", [])
+        return self._filter_by_language(
+            self.responses.get("utter_internal_error_rasa", []), language
+        )
 
     def get_response_variation_id(
         self,

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/core/nlg/response.py

@@ -5,8 +5,11 @@ from typing import Any, Dict, List, Optional, Text
 from rasa.core.constants import DEFAULT_TEMPLATE_ENGINE, TEMPLATE_ENGINE_CONFIG_KEY
 from rasa.core.nlg import interpolator
 from rasa.core.nlg.generator import NaturalLanguageGenerator, ResponseVariationFilter
-from rasa.shared.constants import RESPONSE_CONDITION
+from rasa.core.nlg.translate import get_translated_buttons, get_translated_text
+from rasa.engine.language import Language
+from rasa.shared.constants import BUTTONS, RESPONSE_CONDITION, TEXT
 from rasa.shared.core.domain import RESPONSE_KEYS_TO_INTERPOLATE
+from rasa.shared.core.flows.constants import KEY_TRANSLATION
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.nlu.constants import METADATA
 
@@ -30,7 +33,11 @@ class TemplatedNaturalLanguageGenerator(NaturalLanguageGenerator):
 
     # noinspection PyUnusedLocal
     def _random_response_for(
-        self, utter_action: Text, output_channel: Text, filled_slots: Dict[Text, Any]
+        self,
+        utter_action: Text,
+        output_channel: Text,
+        filled_slots: Dict[Text, Any],
+        language: Optional[Language] = None,
     ) -> Optional[Dict[Text, Any]]:
         """Select random response for the utter action from available ones.
 
@@ -42,7 +49,7 @@ class TemplatedNaturalLanguageGenerator(NaturalLanguageGenerator):
         if utter_action in self.responses:
             response_filter = ResponseVariationFilter(self.responses)
             suitable_responses = response_filter.responses_for_utter_action(
-                utter_action, output_channel, filled_slots
+                utter_action, output_channel, filled_slots, language
             )
 
             if suitable_responses:
@@ -75,9 +82,36 @@ class TemplatedNaturalLanguageGenerator(NaturalLanguageGenerator):
         """Generate a response for the requested utter action."""
         filled_slots = tracker.current_slot_values()
         stack_context = tracker.stack.current_context()
-        return self.generate_from_slots(
-            utter_action, filled_slots, stack_context, output_channel, **kwargs
+        response = self.generate_from_slots(
+            utter_action,
+            filled_slots,
+            stack_context,
+            output_channel,
+            tracker.current_language,
+            **kwargs,
         )
+        if response is not None:
+            return self.translate_response(response, tracker.current_language)
+        return None
+
+    def translate_response(
+        self, response: Dict[Text, Any], language: Optional[Language] = None
+    ) -> Dict[Text, Any]:
+        message_copy = copy.deepcopy(response)
+
+        text = get_translated_text(
+            text=message_copy.pop(TEXT, None),
+            translation=message_copy.pop(KEY_TRANSLATION, {}),
+            language=language,
+        )
+
+        buttons = get_translated_buttons(
+            buttons=message_copy.pop(BUTTONS, None), language=language
+        )
+        message_copy[TEXT] = text
+        if buttons:
+            message_copy[BUTTONS] = buttons
+        return message_copy
 
     def generate_from_slots(
         self,
@@ -85,12 +119,15 @@ class TemplatedNaturalLanguageGenerator(NaturalLanguageGenerator):
         filled_slots: Dict[Text, Any],
         stack_context: Dict[Text, Any],
         output_channel: Text,
+        language: Optional[Language] = None,
         **kwargs: Any,
     ) -> Optional[Dict[Text, Any]]:
         """Generate a response for the requested utter action."""
         # Fetching a random response for the passed utter action
         r = copy.deepcopy(
-            self._random_response_for(utter_action, output_channel, filled_slots)
+            self._random_response_for(
+                utter_action, output_channel, filled_slots, language
+            )
         )
         # Filling the slots in the response with placeholders and returning the response
         if r is not None:

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/core/nlg/translate.py

@@ -23,6 +23,14 @@ def get_translated_text(
     return translation.get(language_code, text)
 
 
+def has_translation(
+    message: Dict[Text, Any], language: Optional[Language] = None
+) -> bool:
+    """Check if the message has a translation for the given language."""
+    language_code = language.code if language else None
+    return language_code in message.get(KEY_TRANSLATION, {})
+
+
 def get_translated_buttons(
     buttons: Optional[List[Dict[Text, Any]]], language: Optional[Language] = None
 ) -> Optional[List[Dict[Text, Any]]]:

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/dialogue_understanding_test/du_test_schema.yml

@@ -5,12 +5,12 @@ mapping:
     sequence:
       - type: map
         mapping:
-          regex;(^[a-zA-Z_]+[a-zA-Z0-9_]*$):
+          regex;(^[a-zA-Z_]+[a-zA-Z0-9_\-]*$):
             type: "seq"
             sequence:
               - type: map
                 mapping:
-                  regex;(^[a-zA-Z_]+[a-zA-Z0-9_]*$):
+                  regex;(^[a-zA-Z_]+[a-zA-Z0-9_\-]*$):
                     type: any
 
   metadata:
@@ -129,7 +129,7 @@ mapping:
             type: "seq"
             sequence:
               - type: "str"
-                pattern: ^[a-zA-Z_]+[a-zA-Z0-9_]*$
+                pattern: ^[a-zA-Z_]+[a-zA-Z0-9_\-]*$
           metadata:
             type: "str"
             pattern: ^[a-zA-Z_]+[a-zA-Z0-9_]*$

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/e2e_test/e2e_test_schema.yml

@@ -5,12 +5,12 @@ mapping:
     sequence:
       - type: map
         mapping:
-          regex;(^[a-zA-Z_]+[a-zA-Z0-9_]*$):
+          regex;(^[a-zA-Z_]+[a-zA-Z0-9_\-]*$):
             type: "seq"
             sequence:
               - type: map
                 mapping:
-                  regex;(^[a-zA-Z_]+[a-zA-Z0-9_]*$):
+                  regex;(^[a-zA-Z_]+[a-zA-Z0-9_\-]*$):
                     type: any
 
   metadata:
@@ -129,7 +129,7 @@ mapping:
             type: "seq"
             sequence:
               - type: "str"
-                pattern: ^[a-zA-Z_]+[a-zA-Z0-9_]*$
+                pattern: ^[a-zA-Z_]+[a-zA-Z0-9_\-]*$
           metadata:
             type: "str"
             pattern: ^[a-zA-Z_]+[a-zA-Z0-9_]*$

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/model_manager/model_api.py

@@ -571,7 +571,7 @@ def external_blueprint() -> Blueprint:
     """Create a blueprint for the model manager API."""
     from rasa.core.channels.socketio import SocketBlueprint
 
-    sio = AsyncServer(async_mode="sanic", cors_allowed_origins=[])
+    sio = AsyncServer(async_mode="sanic", cors_allowed_origins="*")
     bp = SocketBlueprint(sio, "", "model_api_external")
 
     create_bridge_server(sio, running_bots)

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/model_manager/socket_bridge.py

@@ -131,6 +131,13 @@ async def create_bridge_client(
         structlogger.debug("model_runner.bot_message", deployment_id=deployment_id)
         await sio.emit("bot_message", data, room=sid)
 
+    @client.event  # type: ignore[misc]
+    async def error(data: Dict[str, Any]) -> None:
+        structlogger.debug(
+            "model_runner.bot_error", deployment_id=deployment_id, data=data
+        )
+        await sio.emit("error", data, room=sid)
+
     @client.event  # type: ignore[misc]
     async def tracker(data: Dict[str, Any]) -> None:
         await sio.emit("tracker", json.loads(data), room=sid)

{rasa_pro-3.13.10 → rasa_pro-3.13.11}/rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.13.10"
+__version__ = "3.13.11"