rasa-pro 3.13.12__py3-none-any.whl → 3.13.14__py3-none-any.whl

rasa/shared/core/flows/flow.py

@@ -322,9 +322,15 @@ class Flow:
 
     def get_collect_steps(self) -> List[CollectInformationFlowStep]:
         """Return all CollectInformationFlowSteps in the flow."""
-        collect_steps = []
+        collect_steps: List[CollectInformationFlowStep] = []
         for step in self.steps_with_calls_resolved:
-            if isinstance(step, CollectInformationFlowStep):
+            # Only add collect steps that are not already in the list.
+            # This is to avoid returning duplicate collect steps from called flows
+            # in case the called flow is called multiple times.
+            if (
+                isinstance(step, CollectInformationFlowStep)
+                and step not in collect_steps
+            ):
                 collect_steps.append(step)
         return collect_steps
 

rasa/shared/core/slots.py

@@ -351,8 +351,8 @@ class FloatSlot(Slot):
         mappings: List[Dict[Text, Any]],
         initial_value: Optional[float] = None,
         value_reset_delay: Optional[int] = None,
-        max_value: float = 1.0,
-        min_value: float = 0.0,
+        max_value: Optional[float] = None,
+        min_value: Optional[float] = None,
         influence_conversation: bool = True,
         is_builtin: bool = False,
         shared_for_coexistence: bool = False,
@@ -376,32 +376,24 @@ class FloatSlot(Slot):
             filled_by=filled_by,
             validation=validation,
         )
+        self.validate_min_max_range(min_value, max_value)
+
         self.max_value = max_value
         self.min_value = min_value
 
-        if min_value >= max_value:
-            raise InvalidSlotConfigError(
-                "Float slot ('{}') created with an invalid range "
-                "using min ({}) and max ({}) values. Make sure "
-                "min is smaller than max."
-                "".format(self.name, self.min_value, self.max_value)
-            )
-
-        if initial_value is not None and not (min_value <= initial_value <= max_value):
-            rasa.shared.utils.io.raise_warning(
-                f"Float slot ('{self.name}') created with an initial value "
-                f"{self.value}. This value is outside of the configured min "
-                f"({self.min_value}) and max ({self.max_value}) values."
-            )
-
     def _as_feature(self) -> List[float]:
+        # set default min and max values used in prior releases
+        # to prevent regressions for existing models
+        min_value = self.min_value or 0.0
+        max_value = self.max_value or 1.0
+
         try:
-            capped_value = max(self.min_value, min(self.max_value, float(self.value)))
-            if abs(self.max_value - self.min_value) > 0:
-                covered_range = abs(self.max_value - self.min_value)
+            capped_value = max(min_value, min(max_value, float(self.value)))
+            if abs(max_value - min_value) > 0:
+                covered_range = abs(max_value - min_value)
             else:
                 covered_range = 1
-            return [1.0, (capped_value - self.min_value) / covered_range]
+            return [1.0, (capped_value - min_value) / covered_range]
         except (TypeError, ValueError):
             return [0.0, 0.0]
 
@@ -420,13 +412,52 @@ class FloatSlot(Slot):
             return value
 
     def is_valid_value(self, value: Any) -> bool:
-        """Checks if the slot contains the value."""
-        # check that coerced type is float
-        return value is None or isinstance(self.coerce_value(value), float)
+        """Checks if the slot value is valid."""
+        if value is None:
+            return True
+
+        if not isinstance(self.coerce_value(value), float):
+            return False
+
+        if (
+            self.min_value is not None
+            and self.max_value is not None
+            and not (self.min_value <= value <= self.max_value)
+        ):
+            return False
+
+        return True
 
     def _feature_dimensionality(self) -> int:
         return len(self.as_feature())
 
+    def validate_min_max_range(
+        self, min_value: Optional[float], max_value: Optional[float]
+    ) -> None:
+        """Validates the min-max range for the slot.
+
+        Raises:
+            InvalidSlotConfigError, if the min-max range is invalid.
+        """
+        if min_value is not None and max_value is not None and min_value >= max_value:
+            raise InvalidSlotConfigError(
+                f"Float slot ('{self.name}') created with an invalid range "
+                f"using min ({min_value}) and max ({max_value}) values. Make sure "
+                f"min is smaller than max."
+            )
+
+        if (
+            self.initial_value is not None
+            and min_value is not None
+            and max_value is not None
+            and not (min_value <= self.initial_value <= max_value)
+        ):
+            raise InvalidSlotConfigError(
+                f"Float slot ('{self.name}') created with an initial value "
+                f"{self.initial_value}. This value is outside of the configured min "
+                f"({min_value}) and max ({max_value}) values."
+            )
+
 
 class BooleanSlot(Slot):
     """A slot storing a truth value."""

rasa/shared/providers/_configs/azure_openai_client_config.py

@@ -167,8 +167,9 @@ class OAuthConfigWrapper(OAuth, BaseModel):
 
 @dataclass
 class AzureOpenAIClientConfig:
-    """Parses configuration for Azure OpenAI client, resolves aliases and
-    raises deprecation warnings.
+    """Parses configuration for Azure OpenAI client.
+
+    Resolves aliases and raises deprecation warnings.
 
     Raises:
         ValueError: Raised in cases of invalid configuration:
@@ -301,9 +302,7 @@ class AzureOpenAIClientConfig:
 
 
 def is_azure_openai_config(config: dict) -> bool:
-    """Check whether the configuration is meant to configure
-    an Azure OpenAI client.
-    """
+    """Check whether the configuration is meant to configure an Azure OpenAI client."""
     # Resolve any aliases that are specific to Azure OpenAI configuration
     config = AzureOpenAIClientConfig.resolve_config_aliases(config)
 

rasa/shared/providers/_configs/default_litellm_client_config.py

@@ -40,8 +40,9 @@ FORBIDDEN_KEYS = [
 
 @dataclass
 class DefaultLiteLLMClientConfig:
-    """Parses configuration for default LiteLLM client, resolves aliases and
-    raises deprecation warnings.
+    """Parses configuration for default LiteLLM client.
+
+    Resolves aliases and raises deprecation warnings.
 
     Raises:
         ValueError: Raised in cases of invalid configuration:
@@ -72,8 +73,7 @@ class DefaultLiteLLMClientConfig:
 
     @classmethod
     def from_dict(cls, config: dict) -> DefaultLiteLLMClientConfig:
-        """
-        Initializes a dataclass from the passed config.
+        """Initializes a dataclass from the passed config.
 
         Args:
             config: (dict) The config from which to initialize.

rasa/shared/providers/_configs/litellm_router_client_config.py

@@ -38,8 +38,9 @@ _LITELLM_UNSUPPORTED_KEYS = [
 
 @dataclass
 class LiteLLMRouterClientConfig:
-    """Parses configuration for a LiteLLM Router client. The configuration is expected
-    to be in the following format:
+    """Parses configuration for a LiteLLM Router client.
+
+    The configuration is expected to be in the following format:
 
     {
         "id": "model_group_id",

rasa/shared/providers/_configs/openai_client_config.py

@@ -64,8 +64,9 @@ FORBIDDEN_KEYS = [
 
 @dataclass
 class OpenAIClientConfig:
-    """Parses configuration for Azure OpenAI client, resolves aliases and
-    raises deprecation warnings.
+    """Parses configuration for OpenAI client.
+
+    Resolves aliases and raises deprecation warnings.
 
     Raises:
         ValueError: Raised in cases of invalid configuration:
@@ -118,8 +119,7 @@ class OpenAIClientConfig:
 
     @classmethod
     def from_dict(cls, config: dict) -> OpenAIClientConfig:
-        """
-        Initializes a dataclass from the passed config.
+        """Initializes a dataclass from the passed config.
 
         Args:
             config: (dict) The config from which to initialize.
@@ -168,9 +168,7 @@ class OpenAIClientConfig:
 
 
 def is_openai_config(config: dict) -> bool:
-    """Check whether the configuration is meant to configure
-    an OpenAI client.
-    """
+    """Check whether the configuration is meant to configure an OpenAI client."""
     # Process the config to handle all the aliases
     config = OpenAIClientConfig.resolve_config_aliases(config)
 

rasa/shared/providers/_configs/rasa_llm_client_config.py

@@ -22,8 +22,9 @@ structlogger = structlog.get_logger()
 
 @dataclass
 class RasaLLMClientConfig:
-    """Parses configuration for a Rasa Hosted LiteLLM client,
-    checks required keys present.
+    """Parses configuration for a Rasa Hosted LiteLLM client.
+
+    Checks required keys present.
 
     Raises:
         ValueError: Raised in cases of invalid configuration:
@@ -40,8 +41,7 @@ class RasaLLMClientConfig:
 
     @classmethod
     def from_dict(cls, config: dict) -> RasaLLMClientConfig:
-        """
-        Initializes a dataclass from the passed config.
+        """Initializes a dataclass from the passed config.
 
         Args:
             config: (dict) The config from which to initialize.

rasa/shared/providers/_configs/self_hosted_llm_client_config.py

@@ -61,8 +61,9 @@ FORBIDDEN_KEYS = [
 
 @dataclass
 class SelfHostedLLMClientConfig:
-    """Parses configuration for Self Hosted LiteLLM client, resolves aliases and
-    raises deprecation warnings.
+    """Parses configuration for Self Hosted LiteLLM client.
+
+    Resolves aliases and raises deprecation warnings.
 
     Raises:
         ValueError: Raised in cases of invalid configuration:
@@ -116,8 +117,7 @@ class SelfHostedLLMClientConfig:
 
     @classmethod
     def from_dict(cls, config: dict) -> SelfHostedLLMClientConfig:
-        """
-        Initializes a dataclass from the passed config.
+        """Initializes a dataclass from the passed config.
 
         Args:
             config: (dict) The config from which to initialize.

rasa/shared/providers/llm/_base_litellm_client.py

@@ -1,12 +1,14 @@
 from __future__ import annotations
 
+import asyncio
 import logging
 from abc import abstractmethod
-from typing import Any, Dict, List, Union, cast
+from typing import Any, Dict, List, NoReturn, Union, cast
 
 import structlog
 from litellm import acompletion, completion, validate_environment
 
+from rasa.core.constants import DEFAULT_REQUEST_TIMEOUT
 from rasa.shared.constants import (
     _VALIDATE_ENVIRONMENT_MISSING_KEYS_KEY,
     API_BASE_CONFIG_KEY,
@@ -57,26 +59,24 @@ class _BaseLiteLLMClient:
     @property
     @abstractmethod
     def config(self) -> dict:
-        """Returns the configuration for that the llm client
-        in dictionary form.
-        """
+        """Returns the configuration for that the llm client in dictionary form."""
         pass
 
     @property
     @abstractmethod
     def _litellm_model_name(self) -> str:
-        """Returns the value of LiteLLM's model parameter to be used in
-        completion/acompletion in LiteLLM format:
+        """Returns the value of LiteLLM's model parameter.
 
+        To be used in completion/acompletion in LiteLLM format:
         <provider>/<model or deployment name>
         """
         pass
 
     @property
     def _litellm_extra_parameters(self) -> Dict[str, Any]:
-        """Returns a dictionary of extra parameters which include model
-        parameters as well as LiteLLM specific input parameters.
+        """Returns a dictionary of extra parameters.
 
+        Includes model parameters as well as LiteLLM specific input parameters.
         By default, this returns an empty dictionary (no extra parameters).
         """
         return {}
@@ -96,8 +96,9 @@ class _BaseLiteLLMClient:
         }
 
     def validate_client_setup(self) -> None:
-        """Perform client validation. By default only environment variables
-        are validated.
+        """Perform client validation.
+
+        By default only environment variables are validated.
 
         Raises:
             ProviderClientValidationError if validation fails.
@@ -178,8 +179,16 @@ class _BaseLiteLLMClient:
         try:
             formatted_messages = self._get_formatted_messages(messages)
             arguments = resolve_environment_variables(self._completion_fn_args)
-            response = await acompletion(messages=formatted_messages, **arguments)
+            timeout = self._litellm_extra_parameters.get(
+                "timeout", DEFAULT_REQUEST_TIMEOUT
+            )
+            response = await asyncio.wait_for(
+                acompletion(messages=formatted_messages, **arguments),
+                timeout=timeout,
+            )
             return self._format_response(response)
+        except asyncio.TimeoutError:
+            self._handle_timeout_error()
         except Exception as e:
             message = ""
             from rasa.shared.providers.llm.self_hosted_llm_client import (
@@ -199,6 +208,25 @@ class _BaseLiteLLMClient:
                 )
             raise ProviderClientAPIException(e, message)
 
+    def _handle_timeout_error(self) -> NoReturn:
+        """Handle asyncio.TimeoutError and raise ProviderClientAPIException.
+
+        Raises:
+            ProviderClientAPIException: Always raised with formatted timeout error.
+        """
+        timeout = self._litellm_extra_parameters.get("timeout", DEFAULT_REQUEST_TIMEOUT)
+        error_message = (
+            f"APITimeoutError - Request timed out. Error_str: "
+            f"Request timed out. - timeout value={timeout:.6f}, "
+            f"time taken={timeout:.6f} seconds"
+        )
+        # nosemgrep: semgrep.rules.pii-positional-arguments-in-logging
+        # Error message contains only numeric timeout values, not PII
+        structlogger.error(
+            f"{self.__class__.__name__.lower()}.llm.timeout", error=error_message
+        )
+        raise ProviderClientAPIException(asyncio.TimeoutError(error_message)) from None
+
     def _get_formatted_messages(
         self, messages: Union[List[dict], List[str], str]
     ) -> List[Dict[str, str]]:
@@ -280,8 +308,9 @@ class _BaseLiteLLMClient:
 
     @staticmethod
     def _ensure_certificates() -> None:
-        """Configures SSL certificates for LiteLLM. This method is invoked during
-        client initialization.
+        """Configures SSL certificates for LiteLLM.
+
+        This method is invoked during client initialization.
 
         LiteLLM may utilize `openai` clients or other providers that require
         SSL verification settings through the `SSL_VERIFY` / `SSL_CERTIFICATE`

rasa/shared/providers/llm/litellm_router_llm_client.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
 
+import asyncio
 import logging
 from typing import Any, Dict, List, Union
 
 import structlog
 
+from rasa.core.constants import DEFAULT_REQUEST_TIMEOUT
 from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.providers._configs.litellm_router_client_config import (
     LiteLLMRouterClientConfig,
@@ -79,13 +81,14 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
 
     @suppress_logs(log_level=logging.WARNING)
     def _text_completion(self, prompt: Union[List[str], str]) -> LLMResponse:
-        """
-        Synchronously generate completions for given prompt.
+        """Synchronously generate completions for given prompt.
 
         Args:
             prompt: Prompt to generate the completion for.
+
         Returns:
             List of message completions.
+
         Raises:
             ProviderClientAPIException: If the API request fails.
         """
@@ -103,28 +106,36 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
 
     @suppress_logs(log_level=logging.WARNING)
     async def _atext_completion(self, prompt: Union[List[str], str]) -> LLMResponse:
-        """
-        Asynchronously generate completions for given prompt.
+        """Asynchronously generate completions for given prompt.
 
         Args:
             prompt: Prompt to generate the completion for.
+
         Returns:
             List of message completions.
+
         Raises:
             ProviderClientAPIException: If the API request fails.
         """
         try:
-            response = await self.router_client.atext_completion(
-                prompt=prompt, **self._completion_fn_args
+            timeout = self._litellm_extra_parameters.get(
+                "timeout", DEFAULT_REQUEST_TIMEOUT
+            )
+            response = await asyncio.wait_for(
+                self.router_client.atext_completion(
+                    prompt=prompt, **self._completion_fn_args
+                ),
+                timeout=timeout,
             )
             return self._format_text_completion_response(response)
+        except asyncio.TimeoutError:
+            self._handle_timeout_error()
         except Exception as e:
             raise ProviderClientAPIException(e)
 
     @suppress_logs(log_level=logging.WARNING)
     def completion(self, messages: Union[List[dict], List[str], str]) -> LLMResponse:
-        """
-        Synchronously generate completions for given list of messages.
+        """Synchronously generate completions for given list of messages.
 
         Method overrides the base class method to call the appropriate
         completion method based on the configuration. If the chat completions
@@ -140,15 +151,17 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
                 - a list of messages. Each message is a string and will be formatted
                     as a user message.
                 - a single message as a string which will be formatted as user message.
+
         Returns:
             List of message completions.
+
         Raises:
             ProviderClientAPIException: If the API request fails.
         """
         if not self._use_chat_completions_endpoint:
             return self._text_completion(messages)
         try:
-            formatted_messages = self._format_messages(messages)
+            formatted_messages = self._get_formatted_messages(messages)
             response = self.router_client.completion(
                 messages=formatted_messages, **self._completion_fn_args
             )
@@ -160,8 +173,7 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
     async def acompletion(
         self, messages: Union[List[dict], List[str], str]
     ) -> LLMResponse:
-        """
-        Asynchronously generate completions for given list of messages.
+        """Asynchronously generate completions for given list of messages.
 
         Method overrides the base class method to call the appropriate
         completion method based on the configuration. If the chat completions
@@ -177,28 +189,38 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
                 - a list of messages. Each message is a string and will be formatted
                     as a user message.
                 - a single message as a string which will be formatted as user message.
+
         Returns:
             List of message completions.
+
         Raises:
             ProviderClientAPIException: If the API request fails.
         """
         if not self._use_chat_completions_endpoint:
             return await self._atext_completion(messages)
         try:
-            formatted_messages = self._format_messages(messages)
-            response = await self.router_client.acompletion(
-                messages=formatted_messages, **self._completion_fn_args
+            formatted_messages = self._get_formatted_messages(messages)
+            timeout = self._litellm_extra_parameters.get(
+                "timeout", DEFAULT_REQUEST_TIMEOUT
+            )
+            response = await asyncio.wait_for(
+                self.router_client.acompletion(
+                    messages=formatted_messages, **self._completion_fn_args
+                ),
+                timeout=timeout,
             )
             return self._format_response(response)
+        except asyncio.TimeoutError:
+            self._handle_timeout_error()
         except Exception as e:
             raise ProviderClientAPIException(e)
 
     @property
     def _completion_fn_args(self) -> Dict[str, Any]:
-        """Returns the completion arguments for invoking a call through
-        LiteLLM's completion functions.
-        """
+        """Returns the completion arguments.
 
+        For invoking a call through LiteLLM's completion functions.
+        """
         return {
             **self._litellm_extra_parameters,
             LITE_LLM_MODEL_FIELD: self.model_group_id,