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

rasa/core/channels/voice_stream/voice_channel.py

@@ -22,6 +22,7 @@ from rasa.core.channels.voice_stream.asr.asr_event import (
     ASREvent,
     NewTranscript,
     UserIsSpeaking,
+    UserSilence,
 )
 from sanic import Websocket  # type: ignore
 
@@ -244,13 +245,7 @@ class VoiceInputChannel(InputChannel):
         self.monitor_silence = monitor_silence
         self.tts_cache = TTSCache(tts_config.get("cache_size", 1000))
 
-    async def handle_silence_timeout(
-        self,
-        voice_websocket: Websocket,
-        on_new_message: Callable[[UserMessage], Awaitable[Any]],
-        tts_engine: TTSEngine,
-        call_parameters: CallParameters,
-    ) -> None:
+    async def monitor_silence_timeout(self, asr_event_queue: asyncio.Queue) -> None:
         timeout = call_state.silence_timeout
         if not timeout:
             return
@@ -258,16 +253,8 @@ class VoiceInputChannel(InputChannel):
             return
         logger.debug("voice_channel.silence_timeout_watch_started", timeout=timeout)
         await asyncio.sleep(timeout)
+        await asr_event_queue.put(UserSilence())
         logger.debug("voice_channel.silence_timeout_tripped")
-        output_channel = self.create_output_channel(voice_websocket, tts_engine)
-        message = UserMessage(
-            "/silence_timeout",
-            output_channel,
-            call_parameters.stream_id,
-            input_channel=self.name(),
-            metadata=asdict(call_parameters),
-        )
-        await on_new_message(message)
 
     @staticmethod
     def _cancel_silence_timeout_watcher() -> None:
@@ -328,6 +315,7 @@ class VoiceInputChannel(InputChannel):
         _call_state.set(CallState())
         asr_engine = asr_engine_from_config(self.asr_config)
         tts_engine = tts_engine_from_config(self.tts_config)
+        asr_event_queue: asyncio.Queue = asyncio.Queue()
         await asr_engine.connect()
 
         call_parameters = await self.collect_call_parameters(channel_websocket)
@@ -354,12 +342,7 @@ class VoiceInputChannel(InputChannel):
                     self._cancel_silence_timeout_watcher()
                     call_state.silence_timeout_watcher = (  # type: ignore[attr-defined]
                         asyncio.create_task(
-                            self.handle_silence_timeout(
-                                channel_websocket,
-                                on_new_message,
-                                tts_engine,
-                                call_parameters,
-                            )
+                            self.monitor_silence_timeout(asr_event_queue)
                         )
                     )
                 if isinstance(channel_action, NewAudioAction):
@@ -368,8 +351,13 @@ class VoiceInputChannel(InputChannel):
                     # end stream event came from the other side
                     break
 
-        async def consume_asr_events() -> None:
+        async def receive_asr_events() -> None:
             async for event in asr_engine.stream_asr_events():
+                await asr_event_queue.put(event)
+
+        async def handle_asr_events() -> None:
+            while True:
+                event = await asr_event_queue.get()
                 await self.handle_asr_event(
                     event,
                     channel_websocket,
@@ -378,16 +366,18 @@ class VoiceInputChannel(InputChannel):
                     call_parameters,
                 )
 
-        audio_forwarding_task = asyncio.create_task(consume_audio_bytes())
-        asr_event_task = asyncio.create_task(consume_asr_events())
+        tasks = [
+            asyncio.create_task(consume_audio_bytes()),
+            asyncio.create_task(receive_asr_events()),
+            asyncio.create_task(handle_asr_events()),
+        ]
         await asyncio.wait(
-            [audio_forwarding_task, asr_event_task],
+            tasks,
             return_when=asyncio.FIRST_COMPLETED,
         )
-        if not audio_forwarding_task.done():
-            audio_forwarding_task.cancel()
-        if not asr_event_task.done():
-            asr_event_task.cancel()
+        for task in tasks:
+            if not task.done():
+                task.cancel()
         await tts_engine.close_connection()
         await asr_engine.close_connection()
         await channel_websocket.close()
@@ -425,3 +415,13 @@ class VoiceInputChannel(InputChannel):
         elif isinstance(e, UserIsSpeaking):
             self._cancel_silence_timeout_watcher()
             call_state.is_user_speaking = True  # type: ignore[attr-defined]
+        elif isinstance(e, UserSilence):
+            output_channel = self.create_output_channel(voice_websocket, tts_engine)
+            message = UserMessage(
+                "/silence_timeout",
+                output_channel,
+                call_parameters.stream_id,
+                input_channel=self.name(),
+                metadata=asdict(call_parameters),
+            )
+            await on_new_message(message)

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/shared/constants.py

@@ -220,6 +220,7 @@ EXTRA_PARAMETERS_KEY = "extra_parameters"
 MODEL_GROUP_ID_KEY = "model_group_id"
 MODEL_LIST_KEY = "model_list"
 LITELLM_PARAMS_KEY = "litellm_params"
+_VALIDATE_ENVIRONMENT_MISSING_KEYS_KEY = "missing_keys"
 
 LLM_API_HEALTH_CHECK_ENV_VAR = "LLM_API_HEALTH_CHECK"
 LLM_API_HEALTH_CHECK_DEFAULT_VALUE = "false"

rasa/shared/providers/_utils.py

@@ -1,3 +1,5 @@
+from typing import Optional, Dict, Any
+
 import structlog
 
 from rasa.shared.constants import (
@@ -9,6 +11,11 @@ from rasa.shared.constants import (
     AWS_REGION_NAME_CONFIG_KEY,
     AWS_SESSION_TOKEN_CONFIG_KEY,
     AWS_SESSION_TOKEN_ENV_VAR,
+    AZURE_API_BASE_ENV_VAR,
+    API_BASE_CONFIG_KEY,
+    AZURE_API_VERSION_ENV_VAR,
+    API_VERSION_CONFIG_KEY,
+    DEPLOYMENT_CONFIG_KEY,
 )
 from rasa.shared.exceptions import ProviderClientValidationError
 from litellm import validate_environment
@@ -77,3 +84,80 @@ def validate_aws_setup_for_litellm_clients(
             missing_environment_variables=missing_environment_variables,
         )
         raise ProviderClientValidationError(event_info)
+
+
+def validate_azure_client_setup(
+    api_base: Optional[str],
+    api_version: Optional[str],
+    deployment: Optional[str],
+) -> None:
+    """Validates the Azure setup for LiteLLM Router clients to ensure
+     that all required configuration parameters are set.
+
+    Raises:
+        ProviderClientValidationError: If any required Azure configurations
+            is missing.
+    """
+
+    def generate_event_info_for_missing_setting(
+        setting: str,
+        setting_env_var: Optional[str] = None,
+        setting_config_key: Optional[str] = None,
+    ) -> str:
+        """Generate a part of the message with instructions on what to set
+        for the missing client setting.
+        """
+        info = "Set {setting} with {options}. "
+        options = ""
+        if setting_env_var is not None:
+            options += f"environment variable '{setting_env_var}'"
+        if setting_config_key is not None and setting_env_var is not None:
+            options += " or "
+        if setting_config_key is not None:
+            options += f"config key '{setting_config_key}'"
+
+        return info.format(setting=setting, options=options)
+
+    # All required settings for Azure OpenAI client
+    settings: Dict[str, Dict[str, Any]] = {
+        "API Base": {
+            "current_value": api_base,
+            "env_var": AZURE_API_BASE_ENV_VAR,
+            "config_key": API_BASE_CONFIG_KEY,
+        },
+        "API Version": {
+            "current_value": api_version,
+            "env_var": AZURE_API_VERSION_ENV_VAR,
+            "config_key": API_VERSION_CONFIG_KEY,
+        },
+        "Deployment Name": {
+            "current_value": deployment,
+            "env_var": None,
+            "config_key": DEPLOYMENT_CONFIG_KEY,
+        },
+    }
+
+    missing_settings = [
+        setting_name
+        for setting_name, setting_info in settings.items()
+        if setting_info["current_value"] is None
+    ]
+
+    if missing_settings:
+        event_info = f"Client settings not set: " f"{', '.join(missing_settings)}. "
+
+        for missing_setting in missing_settings:
+            if settings[missing_setting]["current_value"] is not None:
+                continue
+            event_info += generate_event_info_for_missing_setting(
+                missing_setting,
+                settings[missing_setting]["env_var"],
+                settings[missing_setting]["config_key"],
+            )
+
+        structlogger.error(
+            "azure_openai_llm_client.not_configured",
+            event_info=event_info,
+            missing_settings=missing_settings,
+        )
+        raise ProviderClientValidationError(event_info)

rasa/shared/providers/llm/_base_litellm_client.py

@@ -9,7 +9,11 @@ from litellm import (
     validate_environment,
 )
 
-from rasa.shared.constants import API_BASE_CONFIG_KEY, API_KEY
+from rasa.shared.constants import (
+    API_BASE_CONFIG_KEY,
+    API_KEY,
+    _VALIDATE_ENVIRONMENT_MISSING_KEYS_KEY,
+)
 from rasa.shared.exceptions import (
     ProviderClientAPIException,
     ProviderClientValidationError,
@@ -23,8 +27,6 @@ from rasa.shared.utils.io import suppress_logs, resolve_environment_variables
 
 structlogger = structlog.get_logger()
 
-_VALIDATE_ENVIRONMENT_MISSING_KEYS_KEY = "missing_keys"
-
 # Suppress LiteLLM info and debug logs - Global level.
 logging.getLogger("LiteLLM").setLevel(logging.WARNING)
 

rasa/shared/providers/llm/azure_openai_llm_client.py

@@ -9,9 +9,6 @@ from rasa.shared.constants import (
     OPENAI_API_VERSION_ENV_VAR,
     AZURE_API_BASE_ENV_VAR,
     AZURE_API_VERSION_ENV_VAR,
-    API_BASE_CONFIG_KEY,
-    API_VERSION_CONFIG_KEY,
-    DEPLOYMENT_CONFIG_KEY,
     AZURE_API_KEY_ENV_VAR,
     OPENAI_API_TYPE_ENV_VAR,
     OPENAI_API_KEY_ENV_VAR,
@@ -23,6 +20,7 @@ from rasa.shared.exceptions import ProviderClientValidationError
 from rasa.shared.providers._configs.azure_openai_client_config import (
     AzureOpenAIClientConfig,
 )
+from rasa.shared.providers._utils import validate_azure_client_setup
 from rasa.shared.providers.llm._base_litellm_client import _BaseLiteLLMClient
 from rasa.shared.utils.io import raise_deprecation_warning
 
@@ -295,65 +293,8 @@ class AzureOpenAILLMClient(_BaseLiteLLMClient):
     def validate_client_setup(self) -> None:
         """Validates that all required configuration parameters are set."""
 
-        def generate_event_info_for_missing_setting(
-            setting: str,
-            setting_env_var: Optional[str] = None,
-            setting_config_key: Optional[str] = None,
-        ) -> str:
-            """Generate a part of the message with instructions on what to set
-            for the missing client setting.
-            """
-            info = "Set {setting} with {options}. "
-            options = ""
-            if setting_env_var is not None:
-                options += f"environment variable '{setting_env_var}'"
-            if setting_config_key is not None and setting_env_var is not None:
-                options += " or "
-            if setting_config_key is not None:
-                options += f"config key '{setting_config_key}'"
-
-            return info.format(setting=setting, options=options)
-
-        # All required settings for Azure OpenAI client
-        settings: Dict[str, Dict[str, Any]] = {
-            "API Base": {
-                "current_value": self.api_base,
-                "env_var": AZURE_API_BASE_ENV_VAR,
-                "config_key": API_BASE_CONFIG_KEY,
-            },
-            "API Version": {
-                "current_value": self.api_version,
-                "env_var": AZURE_API_VERSION_ENV_VAR,
-                "config_key": API_VERSION_CONFIG_KEY,
-            },
-            "Deployment Name": {
-                "current_value": self.deployment,
-                "env_var": None,
-                "config_key": DEPLOYMENT_CONFIG_KEY,
-            },
-        }
-
-        missing_settings = [
-            setting_name
-            for setting_name, setting_info in settings.items()
-            if setting_info["current_value"] is None
-        ]
-
-        if missing_settings:
-            event_info = f"Client settings not set: " f"{', '.join(missing_settings)}. "
-
-            for missing_setting in missing_settings:
-                if settings[missing_setting]["current_value"] is not None:
-                    continue
-                event_info += generate_event_info_for_missing_setting(
-                    missing_setting,
-                    settings[missing_setting]["env_var"],
-                    settings[missing_setting]["config_key"],
-                )
-
-            structlogger.error(
-                "azure_openai_llm_client.not_configured",
-                event_info=event_info,
-                missing_settings=missing_settings,
-            )
-            raise ProviderClientValidationError(event_info)
+        return validate_azure_client_setup(
+            api_base=self.api_base,
+            api_version=self.api_version,
+            deployment=self.deployment,
+        )

rasa/shared/providers/router/_base_litellm_router_client.py

@@ -2,7 +2,7 @@ from typing import Any, Dict, List
 import os
 import structlog
 
-from litellm import Router
+from litellm import Router, validate_environment
 
 from rasa.shared.constants import (
     MODEL_LIST_KEY,
@@ -14,11 +14,18 @@ from rasa.shared.constants import (
     API_KEY,
     MODEL_CONFIG_KEY,
     USE_CHAT_COMPLETIONS_ENDPOINT_CONFIG_KEY,
+    API_BASE_CONFIG_KEY,
+    _VALIDATE_ENVIRONMENT_MISSING_KEYS_KEY,
+    AZURE_OPENAI_PROVIDER,
+    API_VERSION_CONFIG_KEY,
+    AZURE_API_BASE_ENV_VAR,
+    AZURE_API_VERSION_ENV_VAR,
 )
 from rasa.shared.exceptions import ProviderClientValidationError
 from rasa.shared.providers._configs.litellm_router_client_config import (
     LiteLLMRouterClientConfig,
 )
+from rasa.shared.providers._utils import validate_azure_client_setup
 from rasa.shared.utils.io import resolve_environment_variables
 
 structlogger = structlog.get_logger()
@@ -62,6 +69,7 @@ class _BaseLiteLLMRouterClient:
             resolved_model_configurations = (
                 self._resolve_env_vars_in_model_configurations()
             )
+            self._validate_model_configurations(resolved_model_configurations)
             self._router_client = Router(
                 model_list=resolved_model_configurations, **router_settings
             )
@@ -181,3 +189,49 @@ class _BaseLiteLLMRouterClient:
             )
             model_configuration_with_resolved_keys.append(resolved_model_configuration)
         return model_configuration_with_resolved_keys
+
+    def _validate_model_configurations(
+        self, resolved_model_configurations: List[Dict[str, Any]]
+    ) -> None:
+        """Validates the model configurations.
+
+        Args:
+            resolved_model_configurations: (List[Dict[str, Any]]) The list of model
+                configurations with resolved environment variables.
+
+        Raises:
+            ProviderClientValidationError: If the model configurations are invalid.
+        """
+        for model_configuration in resolved_model_configurations:
+            litellm_params = model_configuration.get(LITELLM_PARAMS_KEY, {})
+
+            model = litellm_params.get(MODEL_CONFIG_KEY)
+            provider, deployment = model.split("/", 1)
+            api_base = litellm_params.get(API_BASE_CONFIG_KEY)
+
+            if provider.lower() == AZURE_OPENAI_PROVIDER:
+                validate_azure_client_setup(
+                    api_base=api_base or os.getenv(AZURE_API_BASE_ENV_VAR),
+                    api_version=litellm_params.get(API_VERSION_CONFIG_KEY)
+                    or os.getenv(AZURE_API_VERSION_ENV_VAR),
+                    deployment=deployment,
+                )
+            else:
+                validation_info = validate_environment(
+                    model=model,
+                    api_key=litellm_params.get(API_KEY),
+                    api_base=api_base,
+                )
+                if missing_environment_variables := validation_info.get(
+                    _VALIDATE_ENVIRONMENT_MISSING_KEYS_KEY
+                ):
+                    event_info = (
+                        f"Environment variables: {missing_environment_variables} "
+                        f"not set. Required for API calls."
+                    )
+                    structlogger.error(
+                        "base_litellm_router_client.validate_environment_variables",
+                        event_info=event_info,
+                        missing_environment_variables=missing_environment_variables,
+                    )
+                    raise ProviderClientValidationError(event_info)

rasa/validator.py

@@ -518,7 +518,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,
@@ -553,7 +553,6 @@ class Validator:
                                 f"The slot needs to be added to this key."
                             ),
                         )
-                        everything_is_alright = False
 
         return everything_is_alright
 

rasa/version.py

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

{rasa_pro-3.11.7.dist-info → rasa_pro-3.11.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.11.7
+Version: 3.11.9
 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
@@ -62,13 +62,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.26.4,<1.27.0)
-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)
@@ -116,7 +116,7 @@ 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: 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,<3.28.0)
@@ -146,7 +146,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