rasa-pro 3.14.1__py3-none-any.whl → 3.14.2__py3-none-any.whl

rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -62,7 +62,9 @@ structlogger = structlog.get_logger()
 class LLMBasedCommandGenerator(
     LLMHealthCheckMixin, GraphComponent, CommandGenerator, ABC
 ):
-    """An abstract class defining interface and common functionality
+    """This class provides common functionality for all LLM-based command generators.
+
+    An abstract class defining interface and common functionality
     of an LLM-based command generators.
     """
 
@@ -174,8 +176,9 @@ class LLMBasedCommandGenerator(
     def train(
         self, training_data: TrainingData, flows: FlowsList, domain: Domain
     ) -> Resource:
-        """Train the llm based command generator. Stores all flows into a vector
-        store.
+        """Trains the LLM-based command generator and prepares flow retrieval data.
+
+        Stores all flows into a vector store.
         """
         self.perform_llm_health_check(
             self.config.get(LLM_CONFIG_KEY),

rasa/dialogue_understanding/generator/single_step/compact_llm_command_generator.py

@@ -168,6 +168,20 @@ class CompactLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         if prompt_template is not None:
             return prompt_template
 
+        # Try to load the template from the given path or fallback to the default for
+        # the component.
+        custom_prompt_template_path = config.get(PROMPT_TEMPLATE_CONFIG_KEY)
+        if custom_prompt_template_path is not None:
+            custom_prompt_template = get_prompt_template(
+                custom_prompt_template_path,
+                None,  # Default will be based on the model
+                log_source_component=log_source_component,
+                log_source_method=log_context,
+            )
+            if custom_prompt_template is not None:
+                return custom_prompt_template
+
+        # Fallback to the default prompt template based on the model.
         default_command_prompt_template = get_default_prompt_template_based_on_model(
             llm_config=config.get(LLM_CONFIG_KEY, {}) or {},
             model_prompt_mapping=cls.get_model_prompt_mapper(),
@@ -177,10 +191,4 @@ class CompactLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
             log_source_method=log_context,
         )
 
-        # Return the prompt template either from the config or the default prompt.
-        return get_prompt_template(
-            config.get(PROMPT_TEMPLATE_CONFIG_KEY),
-            default_command_prompt_template,
-            log_source_component=log_source_component,
-            log_source_method=log_context,
-        )
+        return default_command_prompt_template

rasa/dialogue_understanding/generator/single_step/search_ready_llm_command_generator.py

@@ -165,7 +165,20 @@ class SearchReadyLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         if prompt_template is not None:
             return prompt_template
 
-        # Get the default prompt template based on the model name.
+        # Try to load the template from the given path or fallback to the default for
+        # the component.
+        custom_prompt_template_path = config.get(PROMPT_TEMPLATE_CONFIG_KEY)
+        if custom_prompt_template_path is not None:
+            custom_prompt_template = get_prompt_template(
+                custom_prompt_template_path,
+                None,  # Default will be based on the model
+                log_source_component=log_source_component,
+                log_source_method=log_context,
+            )
+            if custom_prompt_template is not None:
+                return custom_prompt_template
+
+        # Fallback to the default prompt template based on the model.
         default_command_prompt_template = get_default_prompt_template_based_on_model(
             llm_config=config.get(LLM_CONFIG_KEY, {}) or {},
             model_prompt_mapping=cls.get_model_prompt_mapper(),
@@ -175,10 +188,4 @@ class SearchReadyLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
             log_source_method=log_context,
         )
 
-        # Return the prompt template either from the config or the default prompt.
-        return get_prompt_template(
-            config.get(PROMPT_TEMPLATE_CONFIG_KEY),
-            default_command_prompt_template,
-            log_source_component=log_source_component,
-            log_source_method=log_context,
-        )
+        return default_command_prompt_template

rasa/dialogue_understanding/processor/command_processor.py

@@ -499,10 +499,22 @@ def clean_up_commands(
         else:
             clean_commands.append(command)
 
+    # ensure that there is only one command of a certain command type
+    clean_commands = ensure_max_number_of_command_type(
+        clean_commands, CannotHandleCommand, 1
+    )
+    clean_commands = ensure_max_number_of_command_type(
+        clean_commands, RepeatBotMessagesCommand, 1
+    )
+    clean_commands = ensure_max_number_of_command_type(
+        clean_commands, ChitChatAnswerCommand, 1
+    )
+
     # Replace CannotHandleCommands with ContinueAgentCommand when an agent is active
     # to keep the agent running, but preserve chitchat
     clean_commands = _replace_cannot_handle_with_continue_agent(clean_commands, tracker)
 
+    # filter out cannot handle commands if there are other commands present
     # when coexistence is enabled, by default there will be a SetSlotCommand
     # for the ROUTE_TO_CALM_SLOT slot.
     if tracker.has_coexistence_routing_slot and len(clean_commands) > 2:
@@ -510,12 +522,6 @@ def clean_up_commands(
     elif not tracker.has_coexistence_routing_slot and len(clean_commands) > 1:
         clean_commands = filter_cannot_handle_command(clean_commands)
 
-    clean_commands = ensure_max_number_of_command_type(
-        clean_commands, RepeatBotMessagesCommand, 1
-    )
-    clean_commands = ensure_max_number_of_command_type(
-        clean_commands, ContinueAgentCommand, 1
-    )
     structlogger.debug(
         "command_processor.clean_up_commands.final_commands",
         command=clean_commands,
@@ -580,7 +586,7 @@ def clean_up_start_flow_command(
         # drop a start flow command if the starting flow is equal
         # to the currently active flow
         structlogger.debug(
-            "command_processor.clean_up_commands." "skip_command_flow_already_active",
+            "command_processor.clean_up_commands.skip_command_flow_already_active",
             command=command,
         )
         return clean_commands

rasa/e2e_test/e2e_config.py

@@ -72,9 +72,10 @@ class LLMJudgeConfig(BaseModel):
 
         llm_config = resolve_model_client_config(llm_config)
         llm_config, llm_extra_parameters = cls.extract_attributes(llm_config)
-        llm_config = combine_custom_and_default_config(
-            llm_config, cls.get_default_llm_config()
-        )
+        if not llm_config:
+            llm_config = combine_custom_and_default_config(
+                llm_config, cls.get_default_llm_config()
+            )
         embeddings_config = resolve_model_client_config(embeddings)
         embeddings_config, embeddings_extra_parameters = cls.extract_attributes(
             embeddings_config

rasa/engine/recipes/default_components.py

@@ -27,22 +27,32 @@ from rasa.shared.utils.common import conditional_import
 
 # components dependent on tensorflow
 TEDPolicy, TED_POLICY_AVAILABLE = conditional_import(
-    "rasa.core.policies.ted_policy", "TEDPolicy"
+    "rasa.core.policies.ted_policy", "TEDPolicy", check_installation_setup=True
 )
 UnexpecTEDIntentPolicy, UNEXPECTED_INTENT_POLICY_AVAILABLE = conditional_import(
-    "rasa.core.policies.unexpected_intent_policy", "UnexpecTEDIntentPolicy"
+    "rasa.core.policies.unexpected_intent_policy",
+    "UnexpecTEDIntentPolicy",
+    check_installation_setup=True,
 )
 DIETClassifier, DIET_CLASSIFIER_AVAILABLE = conditional_import(
-    "rasa.nlu.classifiers.diet_classifier", "DIETClassifier"
+    "rasa.nlu.classifiers.diet_classifier",
+    "DIETClassifier",
+    check_installation_setup=True,
 )
 ConveRTFeaturizer, CONVERT_FEATURIZER_AVAILABLE = conditional_import(
-    "rasa.nlu.featurizers.dense_featurizer.convert_featurizer", "ConveRTFeaturizer"
+    "rasa.nlu.featurizers.dense_featurizer.convert_featurizer",
+    "ConveRTFeaturizer",
+    check_installation_setup=True,
 )
 LanguageModelFeaturizer, LANGUAGE_MODEL_FEATURIZER_AVAILABLE = conditional_import(
-    "rasa.nlu.featurizers.dense_featurizer.lm_featurizer", "LanguageModelFeaturizer"
+    "rasa.nlu.featurizers.dense_featurizer.lm_featurizer",
+    "LanguageModelFeaturizer",
+    check_installation_setup=True,
 )
 ResponseSelector, RESPONSE_SELECTOR_AVAILABLE = conditional_import(
-    "rasa.nlu.selectors.response_selector", "ResponseSelector"
+    "rasa.nlu.selectors.response_selector",
+    "ResponseSelector",
+    check_installation_setup=True,
 )
 
 # components dependent on skops

rasa/graph_components/validators/default_recipe_validator.py

@@ -40,16 +40,22 @@ from rasa.shared.utils.common import conditional_import
 
 # Conditional imports for TensorFlow-dependent components
 TEDPolicy, TED_POLICY_AVAILABLE = conditional_import(
-    "rasa.core.policies.ted_policy", "TEDPolicy"
+    "rasa.core.policies.ted_policy", "TEDPolicy", check_installation_setup=True
 )
 UnexpecTEDIntentPolicy, UNEXPECTED_INTENT_POLICY_AVAILABLE = conditional_import(
-    "rasa.core.policies.unexpected_intent_policy", "UnexpecTEDIntentPolicy"
+    "rasa.core.policies.unexpected_intent_policy",
+    "UnexpecTEDIntentPolicy",
+    check_installation_setup=True,
 )
 DIETClassifier, DIET_CLASSIFIER_AVAILABLE = conditional_import(
-    "rasa.nlu.classifiers.diet_classifier", "DIETClassifier"
+    "rasa.nlu.classifiers.diet_classifier",
+    "DIETClassifier",
+    check_installation_setup=True,
 )
 ResponseSelector, RESPONSE_SELECTOR_AVAILABLE = conditional_import(
-    "rasa.nlu.selectors.response_selector", "ResponseSelector"
+    "rasa.nlu.selectors.response_selector",
+    "ResponseSelector",
+    check_installation_setup=True,
 )
 
 # Conditional imports for nlu components requiring other dependencies than tensorflow

rasa/nlu/classifiers/diet_classifier.py

@@ -9,9 +9,11 @@ from typing import Any, Dict, List, Optional, Text, Tuple, Type, TypeVar, Union
 import numpy as np
 import scipy.sparse
 
+from rasa.utils.installation_utils import check_for_installation_issues
 from rasa.utils.tensorflow import TENSORFLOW_AVAILABLE
 
 if TENSORFLOW_AVAILABLE:
+    check_for_installation_issues()
     import tensorflow as tf
 else:
     tf = None

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

@@ -355,8 +355,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,
@@ -380,32 +380,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]
 
@@ -424,13 +416,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.
@@ -188,10 +189,17 @@ class _BaseLiteLLMClient:
             arguments = cast(
                 Dict[str, Any], resolve_environment_variables(self._completion_fn_args)
             )
-            response = await acompletion(
-                messages=formatted_messages, **{**arguments, **kwargs}
+
+            timeout = self._litellm_extra_parameters.get(
+                "timeout", DEFAULT_REQUEST_TIMEOUT
+            )
+            response = await asyncio.wait_for(
+                acompletion(messages=formatted_messages, **{**arguments, **kwargs}),
+                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 (
@@ -211,6 +219,25 @@ class _BaseLiteLLMClient:
                 )
             raise ProviderClientAPIException(e, message) from e
 
+    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]]:
@@ -312,8 +339,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`