rasa-pro 3.12.5__tar.gz → 3.12.6.dev1__tar.gz

{rasa_pro-3.12.5 → rasa_pro-3.12.6.dev1}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.12.5
+Version: 3.12.6.dev1
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
-Home-page: https://rasa.com
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
 Author: Rasa Technologies GmbH
 Author-email: hi@rasa.com
@@ -86,7 +85,6 @@ Requires-Dist: protobuf (>=4.23.3,<4.25.4)
 Requires-Dist: psutil (>=5.9.5,<6.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.9,<2.10.0)
 Requires-Dist: pycountry (>=22.3.5,<23.0.0)
-Requires-Dist: pydantic (>=2.0,<3.0)
 Requires-Dist: pydot (>=1.4,<1.5)
 Requires-Dist: pykwalify (>=1.8,<1.9)
 Requires-Dist: pymilvus (>=2.4.1,<2.4.2)
@@ -118,7 +116,6 @@ Requires-Dist: scikit-learn (>=1.5.1,<1.6.0)
 Requires-Dist: scipy (>=1.13.1,<1.14.0)
 Requires-Dist: sentencepiece[sentencepiece] (>=0.1.99,<0.2.0) ; extra == "transformers" or extra == "full"
 Requires-Dist: sentry-sdk (>=1.14.0,<1.15.0)
-Requires-Dist: setuptools (>=70.0.0,<70.1.0)
 Requires-Dist: sklearn-crfsuite (>=0.3.6,<0.4.0)
 Requires-Dist: skops (>=0.10.0,<0.11.0)
 Requires-Dist: slack-sdk (>=3.27.1,<3.28.0)
@@ -135,7 +132,7 @@ Requires-Dist: tensorflow-io-gcs-filesystem (==0.34) ; sys_platform == "darwin"
 Requires-Dist: tensorflow-io-gcs-filesystem (==0.34) ; sys_platform == "linux"
 Requires-Dist: tensorflow-macos (==2.14.1) ; sys_platform == "darwin" and platform_machine == "arm64"
 Requires-Dist: tensorflow-metal (==1.1.0) ; (sys_platform == "darwin" and platform_machine == "arm64") and (extra == "metal")
-Requires-Dist: tensorflow-text (==2.14.0) ; sys_platform != "win32" and (platform_machine != "arm64" and platform_machine != "aarch64")
+Requires-Dist: tensorflow-text (==2.14.0) ; sys_platform != "win32" and platform_machine != "arm64" and platform_machine != "aarch64"
 Requires-Dist: tensorflow_hub (>=0.13.0,<0.14.0)
 Requires-Dist: terminaltables (>=3.1.10,<3.2.0)
 Requires-Dist: tiktoken (>=0.7.0,<0.8.0)
@@ -148,8 +145,8 @@ Requires-Dist: typing-utils (>=0.1.0,<0.2.0)
 Requires-Dist: ujson (>=5.8,<6.0)
 Requires-Dist: webexteamssdk (>=1.6.1,<1.7.0)
 Requires-Dist: websockets (>=10.4,<11.0)
-Requires-Dist: wheel (>=0.40.0)
 Project-URL: Documentation, https://rasa.com/docs
+Project-URL: Homepage, https://rasa.com
 Project-URL: Repository, https://github.com/rasahq/rasa
 Description-Content-Type: text/markdown
 

{rasa_pro-3.12.5 → rasa_pro-3.12.6.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.12.5"
+version = "3.12.6.dev1"
 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>",]
@@ -132,7 +132,7 @@ psycopg2-binary = ">=2.9.9,<2.10.0"
 python-dateutil = "~2.8.2"
 protobuf = ">=4.23.3,< 4.25.4"
 tensorflow_hub = "^0.13.0"
-setuptools = "~70.0.0"
+#setuptools = "~70.0.0" #test if this is needed
 ujson = ">=5.8,<6.0"
 regex = "~2024.7.24"
 sentry-sdk = ">=1.14.0,<1.15.0"
@@ -156,7 +156,7 @@ langchain-community = "~0.2.19"
 jinja2 = "~3.1.6"
 openai = "~1.55.3"
 dnspython = "2.6.1"
-wheel = ">=0.40.0"
+#wheel = ">=0.40.0" #test if this is needed
 certifi = ">=2024.07.04"
 cryptography = ">=44.0.1"
 jsonpatch = "^1.33"
@@ -319,7 +319,7 @@ optional = true
 [tool.poetry.dependencies.pymongo]
 version = "~4.10.1"
 
-[tool.poetry.dev-dependencies.pytest-sanic]
+[tool.poetry.group.dev.dependencies.pytest-sanic]
 git = "https://github.com/RasaHQ/pytest-sanic"
 branch = "fix-variable-setting-on-sanic-instance-issue"
 

{rasa_pro-3.12.5 → rasa_pro-3.12.6.dev1}/rasa/core/channels/voice_ready/audiocodes.py

@@ -1,5 +1,6 @@
 import asyncio
 import copy
+import hmac
 import json
 import uuid
 from collections import defaultdict
@@ -245,8 +246,13 @@ class AudiocodesInput(InputChannel):
 
     def _check_token(self, token: Optional[Text]) -> None:
         if not token:
+            structlogger.error("audiocodes.token_not_provided")
             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
     ) -> Conversation:

{rasa_pro-3.12.5 → rasa_pro-3.12.6.dev1}/rasa/core/channels/voice_stream/audiocodes.py

@@ -1,5 +1,6 @@
 import asyncio
 import base64
+import hmac
 import json
 from typing import Any, Awaitable, Callable, Dict, Optional, Text
 
@@ -103,6 +104,7 @@ class AudiocodesVoiceInputChannel(VoiceInputChannel):
 
     def __init__(
         self,
+        token: Optional[Text],
         server_url: str,
         asr_config: Dict,
         tts_config: Dict,
@@ -110,6 +112,22 @@ class AudiocodesVoiceInputChannel(VoiceInputChannel):
     ):
         mark_as_beta_feature("Audiocodes (audiocodes_stream) Channel")
         super().__init__(server_url, asr_config, tts_config, monitor_silence)
+        self.token = token
+
+    @classmethod
+    def from_credentials(
+        cls, credentials: Optional[Dict[str, Any]]
+    ) -> VoiceInputChannel:
+        if not credentials:
+            raise ValueError("No credentials given for Audiocodes voice channel.")
+
+        return cls(
+            token=credentials.get("token"),
+            server_url=credentials["server_url"],
+            asr_config=credentials["asr"],
+            tts_config=credentials["tts"],
+            monitor_silence=credentials.get("monitor_silence", False),
+        )
 
     def channel_bytes_to_rasa_audio_bytes(self, input_bytes: bytes) -> RasaAudioBytes:
         return RasaAudioBytes(base64.b64decode(input_bytes))
@@ -135,6 +153,13 @@ class AudiocodesVoiceInputChannel(VoiceInputChannel):
                     )
                     if activity["name"] == "start":
                         return map_call_params(activity["parameters"])
+            elif data["type"] == "connection.validate":
+                # not part of call flow; only sent when integration is created
+                logger.info(
+                    "audiocodes_stream.collect_call_parameters.connection.validate",
+                    event_info="received request to validate integration",
+                )
+                self._send_validated(channel_websocket, data)
             else:
                 logger.warning("audiocodes_stream.unknown_message", data=data)
         return None
@@ -158,7 +183,7 @@ class AudiocodesVoiceInputChannel(VoiceInputChannel):
                 elif activity["name"] == "playFinished":
                     logger.debug("audiocodes_stream.playFinished", data=activity)
                     if call_state.should_hangup:
-                        logger.info("audiocodes.hangup")
+                        logger.info("audiocodes_stream.hangup")
                         self._send_hangup(ws, data)
                         # the conversation should continue until
                         # we receive a end message from audiocodes
@@ -180,11 +205,10 @@ class AudiocodesVoiceInputChannel(VoiceInputChannel):
         elif data["type"] == "session.end":
             logger.debug("audiocodes_stream.end", data=data)
             return EndConversationAction()
-        elif data["type"] == "connection.validate":
-            # not part of call flow; only sent when integration is created
-            self._send_validated(ws, data)
         else:
-            logger.warning("audiocodes_stream.unknown_message", data=data)
+            logger.warning(
+                "audiocodes_stream.map_input_message.unknown_message", data=data
+            )
 
         return ContinueConversationAction()
 
@@ -254,6 +278,17 @@ class AudiocodesVoiceInputChannel(VoiceInputChannel):
             self.tts_cache,
         )
 
+    def _is_token_valid(self, token: Optional[Text]) -> bool:
+        # If no token is set, always return True
+        if not self.token:
+            return True
+
+        # Token is required, but not provided
+        if not token:
+            return False
+
+        return hmac.compare_digest(str(self.token), str(token))
+
     def blueprint(
         self, on_new_message: Callable[[UserMessage], Awaitable[Any]]
     ) -> Blueprint:
@@ -266,17 +301,26 @@ class AudiocodesVoiceInputChannel(VoiceInputChannel):
 
         @blueprint.websocket("/websocket")  # type: ignore
         async def receive(request: Request, ws: Websocket) -> None:
-            # TODO: validate API key header
-            logger.info("audiocodes.receive", message="Starting audio streaming")
+            if not self._is_token_valid(request.token):
+                logger.error(
+                    "audiocodes_stream.invalid_token",
+                    invalid_token=request.token,
+                )
+                await ws.close(code=1008, reason="Invalid token")
+                return
+
+            logger.info(
+                "audiocodes_stream.receive", event_info="Started websocket connection"
+            )
             try:
                 await self.run_audio_streaming(on_new_message, ws)
             except Exception as e:
                 logger.exception(
-                    "audiocodes.receive",
+                    "audiocodes_stream.receive",
                     message="Error during audio streaming",
                     error=e,
                 )
-                # return 500 error
+                await ws.close(code=1011, reason="Error during audio streaming")
                 raise
 
         return blueprint

{rasa_pro-3.12.5 → rasa_pro-3.12.6.dev1}/rasa/core/channels/voice_stream/genesys.py

@@ -1,4 +1,7 @@
 import asyncio
+import base64
+import hashlib
+import hmac
 import json
 from typing import Any, Awaitable, Callable, Dict, Optional, Text
 
@@ -45,6 +48,7 @@ in the documentation but observed in their example app
 https://github.com/GenesysCloudBlueprints/audioconnector-server-reference-implementation
 """
 MAXIMUM_BINARY_MESSAGE_SIZE = 64000  # 64KB
+HEADER_API_KEY = "X-Api-Key"
 logger = structlog.get_logger(__name__)
 
 
@@ -86,8 +90,31 @@ class GenesysInputChannel(VoiceInputChannel):
     def name(cls) -> str:
         return "genesys"
 
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
+    def __init__(
+        self, api_key: Text, client_secret: Optional[Text], *args: Any, **kwargs: Any
+    ) -> None:
         super().__init__(*args, **kwargs)
+        self.api_key = api_key
+        self.client_secret = client_secret
+
+    @classmethod
+    def from_credentials(
+        cls, credentials: Optional[Dict[str, Any]]
+    ) -> VoiceInputChannel:
+        if not credentials:
+            raise ValueError("No credentials given for Genesys voice channel.")
+
+        if not credentials.get("api_key"):
+            raise ValueError("No API key given for Genesys voice channel (api_key).")
+
+        return cls(
+            api_key=credentials["api_key"],
+            client_secret=credentials.get("client_secret"),
+            server_url=credentials["server_url"],
+            asr_config=credentials["asr"],
+            tts_config=credentials["tts"],
+            monitor_silence=credentials.get("monitor_silence", False),
+        )
 
     def _ensure_channel_data_initialized(self) -> None:
         """Initialize Genesys-specific channel data if not already present.
@@ -273,6 +300,93 @@ class GenesysInputChannel(VoiceInputChannel):
         logger.debug("genesys.disconnect", message=message)
         _schedule_ws_task(ws.send(json.dumps(message)))
 
+    def _calculate_signature(self, request: Request) -> str:
+        """Calculate the signature using request data."""
+        org_id = request.headers.get("Audiohook-Organization-Id")
+        session_id = request.headers.get("Audiohook-Session-Id")
+        correlation_id = request.headers.get("Audiohook-Correlation-Id")
+        api_key = request.headers.get(HEADER_API_KEY)
+
+        # order of components is important!
+        components = [
+            ("@request-target", "/webhooks/genesys/websocket"),
+            ("audiohook-session-id", session_id),
+            ("audiohook-organization-id", org_id),
+            ("audiohook-correlation-id", correlation_id),
+            (HEADER_API_KEY.lower(), api_key),
+            ("@authority", self.server_url),
+        ]
+
+        # Create signature base string
+        signing_string = ""
+        for name, value in components:
+            signing_string += f'"{name}": {value}\n'
+
+        # Add @signature-params
+        signature_input = request.headers["Signature-Input"]
+        _, params_str = signature_input.split("=", 1)
+        signing_string += f'"@signature-params": {params_str}'
+
+        # Calculate the HMAC signature
+        key_bytes = base64.b64decode(self.client_secret)
+        signature = hmac.new(
+            key_bytes, signing_string.encode("utf-8"), hashlib.sha256
+        ).digest()
+        return base64.b64encode(signature).decode("utf-8")
+
+    async def _verify_signature(self, request: Request) -> bool:
+        """Verify the HTTP message signature from Genesys."""
+        if not self.client_secret:
+            logger.info(
+                "genesys.verify_signature.no_client_secret",
+                event_info="Signature verification skipped",
+            )
+            return True  # Skip verification if no client secret
+
+        signature = request.headers.get("Signature")
+        signature_input = request.headers.get("Signature-Input")
+        if not signature or not signature_input:
+            logger.error("genesys.signature.missing_signature_header")
+            return False
+
+        try:
+            actual_signature = signature.split("=", 1)[1].strip(':"')
+            expected_signature = self._calculate_signature(request)
+            return hmac.compare_digest(
+                expected_signature.encode("utf-8"), actual_signature.encode("utf-8")
+            )
+        except Exception as e:
+            logger.exception("genesys.signature.verification_error", error=e)
+            return False
+
+    def _ensure_required_headers(self, request: Request) -> bool:
+        """Ensure required headers are present in the request."""
+        required_headers = [
+            "Audiohook-Organization-Id",
+            "Audiohook-Correlation-Id",
+            "Audiohook-Session-Id",
+            HEADER_API_KEY,
+        ]
+
+        missing_headers = [
+            header for header in required_headers if header not in request.headers
+        ]
+
+        if missing_headers:
+            logger.error(
+                "genesys.missing_required_headers",
+                missing_headers=missing_headers,
+            )
+            return False
+        return True
+
+    def _ensure_api_key(self, request: Request) -> bool:
+        """Ensure the API key is present in the request."""
+        api_key = request.headers.get(HEADER_API_KEY)
+        if not hmac.compare_digest(str(self.api_key), str(api_key)):
+            return False
+        return True
+
     def blueprint(
         self, on_new_message: Callable[[UserMessage], Awaitable[Any]]
     ) -> Blueprint:
@@ -289,23 +403,39 @@ class GenesysInputChannel(VoiceInputChannel):
                 "genesys.receive",
                 audiohook_session_id=request.headers.get("audiohook-session-id"),
             )
-            # validate required headers
-            required_headers = [
-                "audiohook-organization-id",
-                "audiohook-correlation-id",
-                "audiohook-session-id",
-                "x-api-key",
-            ]
-
-            for header in required_headers:
-                if header not in request.headers:
-                    await ws.close(1008, f"Missing required header: {header}")
-                    return
-
-            # TODO: validate API key header
+
+            # verify signature
+            if not await self._verify_signature(request):
+                logger.error("genesys.receive.invalid_signature")
+                await ws.close(code=1008, reason="Invalid signature")
+                return
+
+            # ensure required headers are present
+            if not self._ensure_required_headers(request):
+                await ws.close(code=1002, reason="Missing required headers")
+                return
+
+            # ensure API key is correct
+            if not self._ensure_api_key(request):
+                logger.error(
+                    "genesys.receive.invalid_api_key",
+                    invalid_api_key=request.headers.get(HEADER_API_KEY),
+                )
+                await ws.close(code=1008, reason="Invalid API key")
+                return
+
             # process audio streaming
             logger.info("genesys.receive", message="Starting audio streaming")
-            await self.run_audio_streaming(on_new_message, ws)
+            try:
+                await self.run_audio_streaming(on_new_message, ws)
+            except Exception as e:
+                logger.exception(
+                    "genesys.receive",
+                    message="Error during audio streaming",
+                    error=e,
+                )
+                await ws.close(code=1011, reason="Error during audio streaming")
+                raise
 
         return blueprint
 

{rasa_pro-3.12.5 → rasa_pro-3.12.6.dev1}/rasa/shared/core/domain.py

@@ -1678,6 +1678,14 @@ class Domain:
         """Write domain to a file."""
         as_yaml = self.as_yaml()
         rasa.shared.utils.io.write_text_file(as_yaml, filename)
+        # run the check again on the written domain to catch any errors
+        # that may have been missed in the user defined domain files
+        structlogger.info(
+            "domain.persist.domain_written_to_file",
+            event_info="The entire domain content has been written to file.",
+            filename=filename,
+        )
+        Domain.is_domain_file(filename)
 
     def as_yaml(self) -> Text:
         """Dump the `Domain` object as a YAML string.
@@ -1972,17 +1980,18 @@ class Domain:
 
         try:
             content = read_yaml_file(filename, expand_env_vars=cls.expand_env_vars)
-        except (RasaException, YamlSyntaxException):
-            structlogger.warning(
+        except (RasaException, YamlSyntaxException) as error:
+            structlogger.error(
                 "domain.cannot_load_domain_file",
                 file=filename,
+                error=error,
                 event_info=(
                     f"The file {filename} could not be loaded as domain file. "
                     f"You can use https://yamlchecker.com/ to validate "
                     f"the YAML syntax of your file."
                 ),
             )
-            return False
+            raise RasaException(f"Domain could not be loaded: {error}")
 
         return any(key in content for key in ALL_DOMAIN_KEYS)
 

{rasa_pro-3.12.5 → rasa_pro-3.12.6.dev1}/rasa/shared/core/slot_mappings.py

@@ -115,6 +115,18 @@ class SlotMapping(BaseModel):
             )
             data_copy[KEY_RUN_ACTION_EVERY_TURN] = deprecated_action
 
+            structlogger.warning(
+                "slot_mapping.deprecated_action_key_replaced_with_run_action_every_turn",
+                slot_name=slot_name,
+                event_info=f"The `{KEY_ACTION}` key in slot mappings "
+                f"has been replaced with "
+                f"the `{KEY_RUN_ACTION_EVERY_TURN}` key. "
+                f"This will result in the custom action "
+                f"being executed at every conversation turn "
+                f"automatically. Remove the key "
+                f"to avoid this behavior.",
+            )
+
         run_action_every_turn = data_copy.pop(KEY_RUN_ACTION_EVERY_TURN, None)
 
         coexistence_system = data_copy.pop(KEY_COEXISTENCE_SYSTEM, None)

{rasa_pro-3.12.5 → rasa_pro-3.12.6.dev1}/rasa/version.py

@@ -1,3 +1,4 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.12.5"
+
+__version__ = "3.12.6.dev1"