rasa-pro 3.10.20.dev1__tar.gz → 3.10.21__tar.gz

{rasa_pro-3.10.20.dev1 → rasa_pro-3.10.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.10.20.dev1
+Version: 3.10.21
 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
@@ -60,13 +60,13 @@ Requires-Dist: jsonschema (>=4.22)
 Requires-Dist: keras (==2.14.0)
 Requires-Dist: langchain (>=0.2.17,<0.3.0)
 Requires-Dist: langchain-community (>=0.2.19,<0.3.0)
-Requires-Dist: litellm (>=1.52.6,<1.53.0)
+Requires-Dist: litellm (>=1.64.1,<1.65.0)
 Requires-Dist: matplotlib (>=3.7,<3.8)
 Requires-Dist: mattermostwrapper (>=2.2,<2.3)
 Requires-Dist: mlflow (>=2.15.1,<3.0.0) ; extra == "mlflow"
 Requires-Dist: networkx (>=3.1,<3.2)
 Requires-Dist: numpy (>=1.23.5,<1.25.0) ; python_version >= "3.9" and python_version < "3.11"
-Requires-Dist: openai (>=1.55.3,<1.56.0)
+Requires-Dist: openai (>=1.68.2,<1.69.0)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: opentelemetry-api (>=1.16.0,<1.17.0)
 Requires-Dist: opentelemetry-exporter-jaeger (>=1.16.0,<1.17.0)
@@ -114,7 +114,7 @@ Requires-Dist: scikit-learn (>=1.1.3,<1.2) ; python_version >= "3.9" and python_
 Requires-Dist: scipy (>=1.10.1,<1.11.0) ; python_version >= "3.9" and python_version < "3.11"
 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: setuptools (>=78.1.0,<78.2.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,<4.0.0)
@@ -144,7 +144,7 @@ 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)
+Requires-Dist: wheel (>=0.45.1)
 Project-URL: Documentation, https://rasa.com/docs
 Project-URL: Homepage, https://rasa.com
 Project-URL: Repository, https://github.com/rasahq/rasa

{rasa_pro-3.10.20.dev1 → rasa_pro-3.10.21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.10.20.dev1"
+version = "3.10.21"
 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 = "~78.1.0" # pinning this to same version as Poetry, removing does not update lock file
 ujson = ">=5.8,<6.0"
 regex = ">=2022.10.31,<2022.11"
 sentry-sdk = ">=1.14.0,<1.15.0"
@@ -154,9 +154,9 @@ structlog-sentry = "^2.0.3"
 langchain = "~0.2.17"
 langchain-community = "~0.2.19"
 jinja2 = "~3.1.6"
-openai = "~1.55.3"
+openai = "~1.68.2"
 dnspython = "2.6.1"
-wheel = ">=0.40.0"
+wheel = ">=0.45.1" # pinning this to same version as Poetry, removing does not update lock file
 certifi = ">=2024.07.04"
 cryptography = ">=44.0.1"
 jsonpatch = "^1.33"
@@ -183,7 +183,7 @@ qdrant-client = "^1.9.0"
 psutil = "^5.9.5"
 tenacity = "~8.4.1" # pinned down because of langchain
 types-protobuf = "4.25.0.20240417"
-litellm = "~1.52.6"
+litellm = "~1.64.1"
 openpyxl = "^3.1.5"
 diskcache = "~5.6.3"
 skops = "~0.10.0"
@@ -345,6 +345,7 @@ convention = "google"
 "tests/shared/core/test_domain.py" = [ "E501",]
 
 
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.10.20.dev1 → rasa_pro-3.10.21}/rasa/cli/run.py

@@ -62,12 +62,16 @@ def run_actions(args: argparse.Namespace) -> None:
 
 def _validate_model_path(model_path: Text, parameter: Text, default: Text) -> Text:
     if model_path is not None and not os.path.exists(model_path):
-        reason_str = f"'{model_path}' not found."
-        if model_path is None:
-            reason_str = f"Parameter '{parameter}' not set."
-
-        logger.debug(f"{reason_str} Using default location '{default}' instead.")
-
+        raise ModelNotFound(
+            f"The provided model path '{model_path}' could not be found. "
+            "Provide an existing model path."
+        )
+
+    if model_path is None:
+        logger.debug(
+            f"Parameter '{parameter}' not set. "
+            "Using default location '{default}' instead."
+        )
         os.makedirs(default, exist_ok=True)
         model_path = default
 

{rasa_pro-3.10.20.dev1 → rasa_pro-3.10.21}/rasa/cli/utils.py

@@ -14,6 +14,7 @@ import structlog
 import rasa.shared.utils.cli
 import rasa.shared.utils.io
 from rasa import telemetry
+from rasa.exceptions import ModelNotFound
 from rasa.shared.constants import (
     ASSISTANT_ID_DEFAULT_VALUE,
     ASSISTANT_ID_KEY,
@@ -76,6 +77,12 @@ def get_validated_path(
     if current and os.path.exists(current):
         return current
 
+    if parameter == "model":
+        raise ModelNotFound(
+            f"The provided model path '{current}' could not be found. "
+            "Provide an existing model path."
+        )
+
     # try to find a valid option among the defaults
     if isinstance(default, str) or isinstance(default, Path):
         default_options = [str(default)]

{rasa_pro-3.10.20.dev1 → rasa_pro-3.10.21}/rasa/core/channels/channel.py

@@ -1,29 +1,36 @@
+from __future__ import annotations
+
+import hmac
 import json
 import logging
 import uuid
-import jwt
-from sanic import Sanic, Blueprint
-from sanic.request import Request
+from base64 import b64encode
+from functools import wraps
 from typing import (
-    Text,
-    List,
-    Dict,
     Any,
-    Optional,
+    Awaitable,
     Callable,
+    Dict,
     Iterable,
-    Awaitable,
+    List,
     NoReturn,
+    Optional,
+    Text,
 )
 
+import jwt
+from sanic import Blueprint, Sanic
+from sanic.exceptions import Unauthorized
+from sanic.request import Request
+
 from rasa.cli import utils as cli_utils
-from rasa.shared.constants import DOCS_BASE_URL, DEFAULT_SENDER_ID
 from rasa.core.constants import BEARER_TOKEN_PREFIX
-from rasa.shared.exceptions import RasaException
+from rasa.shared.constants import DEFAULT_SENDER_ID, DOCS_BASE_URL
 from rasa.shared.core.trackers import (
     DialogueStateTracker,
     EventVerbosity,
 )
+from rasa.shared.exceptions import RasaException
 
 try:
     from urlparse import urljoin
@@ -417,3 +424,90 @@ class CollectingOutputChannel(OutputChannel):
         self, recipient_id: Text, json_message: Dict[Text, Any], **kwargs: Any
     ) -> None:
         await self._persist_message(self._message(recipient_id, custom=json_message))
+
+
+BASIC_AUTH_SCHEME = "Basic"
+
+
+def create_auth_requested_response_provider(
+    realm: str,
+) -> Callable[[Request, Any, Any], ResponseWithAuthRequested]:
+    def _provider(
+        request: Request, *args: Any, **kwargs: Any
+    ) -> ResponseWithAuthRequested:
+        return ResponseWithAuthRequested(scheme=BASIC_AUTH_SCHEME, realm=realm)
+
+    return _provider
+
+
+class ResponseWithAuthRequested(Unauthorized):
+    """Custom exception to request authentication."""
+
+    def __init__(self, scheme: str, realm: str) -> None:
+        super().__init__(
+            message="Authentication requested.", scheme=scheme, realm=realm
+        )  # type: ignore[no-untyped-call]
+
+
+def requires_basic_auth(
+    username: Optional[Text],
+    password: Optional[Text],
+    auth_request_provider: Optional[Callable[[Request, Any, Any], Unauthorized]] = None,
+) -> Callable:
+    """Decorator to require basic auth for a route.
+
+    Args:
+        username: The username to check against.
+        password: The password to check against.
+        auth_request_provider: Optional function to provide a custom
+            response when authentication is requested. This function should
+            return an instance of `Unauthorized` with the necessary
+            authentication headers.
+    Returns:
+        A decorator that checks for basic authentication.
+
+    Raises:
+        Unauthorized: If the authentication fails or if authentication is
+            requested without necessary credentials (headers).
+    """
+
+    def decorator(func: Callable) -> Callable:
+        @wraps(func)
+        async def wrapper(request: Request, *args: Any, **kwargs: Any) -> Any:
+            if not username or not password:
+                return await func(request, *args, **kwargs)
+
+            auth_header = request.headers.get("Authorization")
+
+            # Some systems will first send a request without an authorization header
+            # to check if the endpoint is available. In this case, we need to
+            # return am Unauthorized response with the necessary authorization header
+            # to indicate that the endpoint requires authorization.
+            if not auth_header and auth_request_provider:
+                # if the request does not contain an authorization header,
+                # we raise an exception to request authorization
+
+                exception = auth_request_provider(request, *args, **kwargs)
+                logger.debug(
+                    f"Responding with {exception.status_code} and "
+                    f"necessary auth headers {exception.headers}"
+                )
+                raise exception
+
+            if not auth_header or not auth_header.startswith("Basic "):
+                logger.error("Missing or invalid authorization header.")
+                raise Unauthorized("Missing or invalid authorization header.")  # type: ignore[no-untyped-call]
+
+            encoded = b64encode(f"{username}:{password}".encode()).decode()
+            username_password_digest: str = auth_header[len(BASIC_AUTH_SCHEME) :]
+            username_password_digest = username_password_digest.strip()
+
+            if not hmac.compare_digest(username_password_digest, encoded):
+                logger.error("Invalid username or password.")
+                raise Unauthorized("Invalid username or password.")  # type: ignore[no-untyped-call]
+
+            return await func(request, *args, **kwargs)
+
+        return wrapper
+
+    return decorator

{rasa_pro-3.10.20.dev1 → rasa_pro-3.10.21}/rasa/core/channels/twilio_voice.py

@@ -1,18 +1,27 @@
+from typing import Any, Awaitable, Callable, Dict, List, Optional, Text
+
+import structlog
 from sanic import Blueprint, response
 from sanic.request import Request
 from sanic.response import HTTPResponse
-from twilio.twiml.voice_response import VoiceResponse, Gather
-from typing import Text, Callable, Awaitable, List, Any, Dict, Optional
+from twilio.twiml.voice_response import Gather, VoiceResponse
 
-import rasa.utils.io
 import rasa.shared.utils.io
-from rasa.shared.core.events import BotUttered
-from rasa.shared.exceptions import InvalidConfigException
+import rasa.utils.io
 from rasa.core.channels.channel import (
-    InputChannel,
     CollectingOutputChannel,
+    InputChannel,
     UserMessage,
+    create_auth_requested_response_provider,
+    requires_basic_auth,
 )
+from rasa.shared.core.events import BotUttered
+from rasa.shared.exceptions import InvalidConfigException, RasaException
+
+logger = structlog.get_logger(__name__)
+
+
+TWILIO_VOICE_PATH = "webhooks/twilio_voice/webhook"
 
 
 class TwilioVoiceInput(InputChannel):
@@ -104,6 +113,14 @@ class TwilioVoiceInput(InputChannel):
         """Load custom configurations."""
         credentials = credentials or {}
 
+        username = credentials.get("username")
+        password = credentials.get("password")
+        if (username is None) != (password is None):
+            raise RasaException(
+                "In TwilioVoice channel, either both username and password "
+                "or neither should be provided. "
+            )
+
         return cls(
             credentials.get("initial_prompt", "hello"),
             credentials.get(
@@ -114,6 +131,8 @@ class TwilioVoiceInput(InputChannel):
             credentials.get("speech_timeout", "5"),
             credentials.get("speech_model", "default"),
             credentials.get("enhanced", "false"),
+            username=username,
+            password=password,
         )
 
     def __init__(
@@ -124,6 +143,8 @@ class TwilioVoiceInput(InputChannel):
         speech_timeout: Text = "5",
         speech_model: Text = "default",
         enhanced: Text = "false",
+        username: Optional[Text] = None,
+        password: Optional[Text] = None,
     ) -> None:
         """Creates a connection to Twilio voice.
 
@@ -141,6 +162,8 @@ class TwilioVoiceInput(InputChannel):
         self.speech_timeout = speech_timeout
         self.speech_model = speech_model
         self.enhanced = enhanced
+        self.username = username
+        self.password = password
 
         self._validate_configuration()
 
@@ -149,6 +172,9 @@ class TwilioVoiceInput(InputChannel):
         if self.assistant_voice not in self.SUPPORTED_VOICES:
             self._raise_invalid_voice_exception()
 
+        if (self.username is None) != (self.password is None):
+            self._raise_invalid_credentials_exception()
+
         try:
             int(self.speech_timeout)
         except ValueError:
@@ -234,6 +260,13 @@ class TwilioVoiceInput(InputChannel):
             return response.json({"status": "ok"})
 
         @twilio_voice_webhook.route("/webhook", methods=["POST"])
+        @requires_basic_auth(
+            username=self.username,
+            password=self.password,
+            auth_request_provider=create_auth_requested_response_provider(
+                TWILIO_VOICE_PATH
+            ),
+        )
         async def receive(request: Request) -> HTTPResponse:
             sender_id = request.form.get("From")
             text = request.form.get("SpeechResult")
@@ -277,6 +310,11 @@ class TwilioVoiceInput(InputChannel):
                 twilio_response = self._build_twilio_voice_response(
                     [{"text": last_response_text}]
                 )
+
+            logger.debug(
+                "twilio_voice.webhook.twilio_response",
+                twilio_response=str(twilio_response),
+            )
             return response.text(str(twilio_response), content_type="text/xml")
 
         return twilio_voice_webhook
@@ -295,6 +333,13 @@ class TwilioVoiceInput(InputChannel):
             enhanced=self.enhanced,
         )
 
+        if not messages:
+            # In case bot has a greet message disabled
+            # or if the bot is not configured to send an initial message
+            # we need to send a voice response with speech settings
+            voice_response.append(gather)
+            return voice_response
+
         # Add pauses between messages.
         # Add a listener to the last message to listen for user response.
         for i, message in enumerate(messages):
@@ -308,6 +353,12 @@ class TwilioVoiceInput(InputChannel):
 
         return voice_response
 
+    def _raise_invalid_credentials_exception(self) -> None:
+        raise InvalidConfigException(
+            "In TwilioVoice channel, either both username and password "
+            "or neither should be provided. "
+        )
+
 
 class TwilioVoiceCollectingOutputChannel(CollectingOutputChannel):
     """Output channel that collects send messages in a list.

{rasa_pro-3.10.20.dev1 → rasa_pro-3.10.21}/rasa/e2e_test/utils/validation.py

@@ -6,6 +6,7 @@ import structlog
 
 import rasa.shared.utils.io
 from rasa.e2e_test.constants import SCHEMA_FILE_PATH
+from rasa.exceptions import ModelNotFound
 from rasa.shared.utils.yaml import read_schema_file
 
 if TYPE_CHECKING:
@@ -54,10 +55,9 @@ def validate_model_path(model_path: Optional[str], parameter: str, default: str)
         return model_path
 
     if model_path and not Path(model_path).exists():
-        rasa.shared.utils.io.raise_warning(
+        raise ModelNotFound(
             f"The provided model path '{model_path}' could not be found. "
-            f"Using default location '{default}' instead.",
-            UserWarning,
+            "Provide an existing model path."
         )
 
     elif model_path is None:

{rasa_pro-3.10.20.dev1 → rasa_pro-3.10.21}/rasa/validator.py

@@ -511,7 +511,7 @@ class Validator:
                         condition_active_loop
                         and condition_active_loop not in self.domain.form_names
                     ):
-                        structlogger.warn(
+                        structlogger.error(
                             "validator.verify_slot_mappings.not_in_domain",
                             slot=slot.name,
                             form=condition_active_loop,
@@ -546,7 +546,6 @@ class Validator:
                                 f"The slot needs to be added to this key."
                             ),
                         )
-                        everything_is_alright = False
 
         return everything_is_alright
 

{rasa_pro-3.10.20.dev1 → rasa_pro-3.10.21}/rasa/version.py

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