rasa-pro 3.13.0.dev20250612__py3-none-any.whl → 3.13.0rc1__py3-none-any.whl

rasa/shared/core/flows/validation.py

@@ -8,6 +8,7 @@ from typing import List, Optional, Set, Text
 
 from rasa.shared.constants import (
     RASA_DEFAULT_FLOW_PATTERN_PREFIX,
+    RASA_PATTERN_CHITCHAT,
     RASA_PATTERN_HUMAN_HANDOFF,
     RASA_PATTERN_INTERNAL_ERROR,
 )
@@ -186,8 +187,10 @@ class ReferenceToPatternException(RasaException):
             return message + "Patterns can not be used as a target for a call step."
         else:
             return message + (
-                "All patterns, except for 'pattern_human_handoff', can "
-                "not be used as a target for a link step."
+                "Patterns cannot be used as a target in link steps, except for "
+                "'pattern_human_handoff', which may be linked from both user-defined "
+                "flows and other patterns. 'pattern_chitchat' may only be linked "
+                "from other patterns."
             )
 
 
@@ -578,11 +581,18 @@ def validate_linked_flows_exists(flows: "FlowsList") -> None:
                 continue
 
             # It might be that the flows do not contain the default rasa patterns, but
-            # only the user flows. Manually check for `pattern_human_handoff` as this
-            # pattern can be linked to and it is part of the default patterns of rasa.
+            # only the user flows. Manually check for `pattern_human_handoff` and
+            # 'pattern_chitchat' as these patterns can be linked to and are part of the
+            # default patterns of rasa.
             if (
                 flows.flow_by_id(step.link) is None
+                # Allow linking to human-handoff from both patterns
+                # and user-defined flows
                 and step.link != RASA_PATTERN_HUMAN_HANDOFF
+                # Allow linking to 'pattern_chitchat' only from other patterns
+                and not (
+                    flow.is_rasa_default_flow and step.link == RASA_PATTERN_CHITCHAT
+                )
             ):
                 raise UnresolvedFlowException(step.link, flow.id, step.id)
 
@@ -597,7 +607,13 @@ def validate_patterns_are_not_called_or_linked(flows: "FlowsList") -> None:
             if (
                 isinstance(step, LinkFlowStep)
                 and step.link.startswith(RASA_DEFAULT_FLOW_PATTERN_PREFIX)
+                # Allow linking to human-handoff from both patterns
+                # and user-defined flows
                 and step.link != RASA_PATTERN_HUMAN_HANDOFF
+                # Allow linking to 'pattern_chitchat' only from other patterns
+                and not (
+                    flow.is_rasa_default_flow and step.link == RASA_PATTERN_CHITCHAT
+                )
             ):
                 raise ReferenceToPatternException(
                     step.link, flow.id, step.id, call_step=False
@@ -617,7 +633,8 @@ def validate_patterns_are_not_calling_or_linking_other_flows(
     """Validates that patterns do not contain call or link steps.
 
     Link steps to user flows are allowed for all patterns but 'pattern_internal_error'.
-    Link steps to other patterns, except for 'pattern_human_handoff', are forbidden.
+    Link steps to other patterns, except for 'pattern_human_handoff' and
+    'pattern_chitchat' are forbidden.
     """
     for flow in flows.underlying_flows:
         if not flow.is_rasa_default_flow:
@@ -627,6 +644,9 @@ def validate_patterns_are_not_calling_or_linking_other_flows(
                 if step.link == RASA_PATTERN_HUMAN_HANDOFF:
                     # links to 'pattern_human_handoff' are allowed
                     continue
+                if step.link == RASA_PATTERN_CHITCHAT:
+                    # links to 'pattern_chitchat' are allowed
+                    continue
                 if step.link.startswith(RASA_DEFAULT_FLOW_PATTERN_PREFIX):
                     # all other patterns are allowed to link to user flows, but not
                     # to other patterns

rasa/shared/core/slots.py

@@ -311,6 +311,34 @@ class Slot(ABC):
         """Indicates if the slot requires validation."""
         return True if self.validation else False
 
+    def to_dict(
+        self,
+        *,
+        include_private: bool = False,
+    ) -> Dict[str, Any]:
+        """Return a dictionary with attributes of this slot instance.
+
+        Args:
+            include_private: If `True`, private attributes are included.
+
+        Returns:
+            A plain `dict` that can be JSON-serialised.
+        """
+        result: Dict[str, Any] = {}
+
+        for attr, value in vars(self).items():
+            if not include_private and attr.startswith("_"):
+                continue
+
+            if attr == "mappings":
+                result[attr] = [mapping.as_dict() for mapping in value]
+                continue
+
+            result[attr] = value
+
+        result.setdefault("type", self.type_name)
+        return result
+
 
 class FloatSlot(Slot):
     """A slot storing a float value."""

rasa/shared/core/training_data/story_reader/yaml_story_reader.py

@@ -1,4 +1,3 @@
-import copy
 import functools
 import json
 import logging
@@ -648,9 +647,7 @@ class YAMLStoryReader(StoryReader):
         # message text did start with the special prefix -- however, a user might
         # just have decided to start their text this way.
         if not match:
-            structlogger.warning(
-                "message.parsing.failed", user_text=copy.deepcopy(user_text)
-            )
+            structlogger.warning("message.parsing.failed")
             return message
 
         # Extract attributes from the match - and validate it via the domain.

rasa/shared/exceptions.py

@@ -165,3 +165,7 @@ class ProviderClientAPIException(RasaException):
 
 class ProviderClientValidationError(RasaException):
     """Raised for errors that occur during validation of the API client."""
+
+
+class FinetuningDataPreparationException(RasaException):
+    """Raised when there is an error in data preparation for fine-tuning."""

rasa/shared/providers/_configs/azure_openai_client_config.py

@@ -23,6 +23,8 @@ from rasa.shared.constants import (
     DEPLOYMENT_NAME_CONFIG_KEY,
     ENGINE_CONFIG_KEY,
     LANGCHAIN_TYPE_CONFIG_KEY,
+    MAX_COMPLETION_TOKENS_CONFIG_KEY,
+    MAX_TOKENS_CONFIG_KEY,
     MODEL_CONFIG_KEY,
     MODEL_NAME_CONFIG_KEY,
     N_REPHRASES_CONFIG_KEY,
@@ -44,13 +46,13 @@ from rasa.shared.providers._configs.oauth_config import (
     OAUTH_TYPE_FIELD,
     OAuth,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.common import class_from_module_path
+from rasa.shared.utils.configs import (
     raise_deprecation_warnings,
     resolve_aliases,
     validate_forbidden_keys,
     validate_required_keys,
 )
-from rasa.shared.utils.common import class_from_module_path
 
 structlogger = structlog.get_logger()
 
@@ -71,6 +73,8 @@ DEPRECATED_ALIASES_TO_STANDARD_KEY_MAPPING = {
     MODEL_NAME_CONFIG_KEY: MODEL_CONFIG_KEY,
     # Timeout aliases
     REQUEST_TIMEOUT_CONFIG_KEY: TIMEOUT_CONFIG_KEY,
+    # Max tokens aliases
+    MAX_TOKENS_CONFIG_KEY: MAX_COMPLETION_TOKENS_CONFIG_KEY,
 }
 
 REQUIRED_KEYS = [DEPLOYMENT_CONFIG_KEY]

rasa/shared/providers/_configs/default_litellm_client_config.py

@@ -15,7 +15,7 @@ from rasa.shared.constants import (
     STREAM_CONFIG_KEY,
     TIMEOUT_CONFIG_KEY,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.configs import (
     raise_deprecation_warnings,
     resolve_aliases,
     validate_forbidden_keys,

rasa/shared/providers/_configs/huggingface_local_embedding_client_config.py

@@ -21,7 +21,7 @@ from rasa.shared.constants import (
     REQUEST_TIMEOUT_CONFIG_KEY,
     TIMEOUT_CONFIG_KEY,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.configs import (
     raise_deprecation_warnings,
     resolve_aliases,
     validate_required_keys,

rasa/shared/providers/_configs/openai_client_config.py

@@ -10,6 +10,8 @@ from rasa.shared.constants import (
     API_TYPE_CONFIG_KEY,
     API_VERSION_CONFIG_KEY,
     LANGCHAIN_TYPE_CONFIG_KEY,
+    MAX_COMPLETION_TOKENS_CONFIG_KEY,
+    MAX_TOKENS_CONFIG_KEY,
     MODEL_CONFIG_KEY,
     MODEL_NAME_CONFIG_KEY,
     N_REPHRASES_CONFIG_KEY,
@@ -24,7 +26,7 @@ from rasa.shared.constants import (
     STREAM_CONFIG_KEY,
     TIMEOUT_CONFIG_KEY,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.configs import (
     raise_deprecation_warnings,
     resolve_aliases,
     validate_forbidden_keys,
@@ -48,6 +50,8 @@ DEPRECATED_ALIASES_TO_STANDARD_KEY_MAPPING = {
     OPENAI_API_VERSION_CONFIG_KEY: API_VERSION_CONFIG_KEY,
     # Timeout aliases
     REQUEST_TIMEOUT_CONFIG_KEY: TIMEOUT_CONFIG_KEY,
+    # Max tokens aliases
+    MAX_TOKENS_CONFIG_KEY: MAX_COMPLETION_TOKENS_CONFIG_KEY,
 }
 
 REQUIRED_KEYS = [MODEL_CONFIG_KEY]

rasa/shared/providers/_configs/rasa_llm_client_config.py

@@ -11,7 +11,7 @@ from rasa.shared.constants import (
     PROVIDER_CONFIG_KEY,
     RASA_PROVIDER,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.configs import (
     validate_required_keys,
 )
 

rasa/shared/providers/_configs/self_hosted_llm_client_config.py

@@ -25,7 +25,7 @@ from rasa.shared.constants import (
     TIMEOUT_CONFIG_KEY,
     USE_CHAT_COMPLETIONS_ENDPOINT_CONFIG_KEY,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.configs import (
     raise_deprecation_warnings,
     resolve_aliases,
     validate_forbidden_keys,

rasa/shared/providers/_configs/utils.py

@@ -1,107 +1,8 @@
 import structlog
 
-from rasa.shared.utils.io import raise_deprecation_warning
-
 structlogger = structlog.get_logger()
 
 
-def resolve_aliases(config: dict, deprecated_alias_mapping: dict) -> dict:
-    """
-    Resolve aliases in the configuration to standard keys.
-
-    Args:
-        config: Dictionary containing the configuration.
-        deprecated_alias_mapping: Dictionary mapping aliases to
-            their standard keys.
-
-    Returns:
-        New dictionary containing the processed configuration.
-    """
-    config = config.copy()
-
-    for alias, standard_key in deprecated_alias_mapping.items():
-        # We check for the alias instead of the standard key because our goal is to
-        # update the standard key when the alias is found. Since the standard key is
-        # always included in the default component configurations, we overwrite it
-        # with the alias value if the alias exists.
-        if alias in config:
-            config[standard_key] = config.pop(alias)
-
-    return config
-
-
-def raise_deprecation_warnings(config: dict, deprecated_alias_mapping: dict) -> None:
-    """
-    Raises warnings for deprecated keys in the configuration.
-
-    Args:
-        config: Dictionary containing the configuration.
-        deprecated_alias_mapping: Dictionary mapping deprecated keys to
-            their standard keys.
-
-    Raises:
-        DeprecationWarning: If any deprecated key is found in the config.
-    """
-    for alias, standard_key in deprecated_alias_mapping.items():
-        if alias in config:
-            raise_deprecation_warning(
-                message=(
-                    f"'{alias}' is deprecated and will be removed in "
-                    f"4.0.0. Use '{standard_key}' instead."
-                )
-            )
-
-
-def validate_required_keys(config: dict, required_keys: list) -> None:
-    """
-    Validates that the passed config contains all the required keys.
-
-    Args:
-        config: Dictionary containing the configuration.
-        required_keys: List of keys that must be present in the config.
-
-    Raises:
-        ValueError: If any required key is missing.
-    """
-    missing_keys = [key for key in required_keys if key not in config]
-    if missing_keys:
-        message = f"Missing required keys '{missing_keys}' for configuration."
-        structlogger.error(
-            "validate_required_keys",
-            message=message,
-            missing_keys=missing_keys,
-            config=config,
-        )
-        raise ValueError(message)
-
-
-def validate_forbidden_keys(config: dict, forbidden_keys: list) -> None:
-    """
-    Validates that the passed config doesn't contain any forbidden keys.
-
-    Args:
-        config: Dictionary containing the configuration.
-        forbidden_keys: List of keys that are forbidden in the config.
-
-    Raises:
-        ValueError: If any forbidden key is present.
-    """
-    forbidden_keys_in_config = set(config.keys()).intersection(set(forbidden_keys))
-
-    if forbidden_keys_in_config:
-        message = (
-            f"Forbidden keys '{forbidden_keys_in_config}' present "
-            f"in the configuration."
-        )
-        structlogger.error(
-            "validate_forbidden_keys",
-            message=message,
-            forbidden_keys=forbidden_keys_in_config,
-            config=config,
-        )
-        raise ValueError(message)
-
-
 def get_provider_prefixed_model_name(provider: str, model: str) -> str:
     """
     Returns the model name with the provider prefixed.

rasa/shared/providers/embedding/_base_litellm_embedding_client.py

@@ -70,7 +70,10 @@ class _BaseLiteLLMEmbeddingClient:
     def _embedding_fn_args(self) -> Dict[str, Any]:
         """Returns the arguments to be passed to the embedding function."""
         return {
+            # Parameters set through config, can override drop_params
             **self._litellm_extra_parameters,
+            # Model name is constructed in the LiteLLM format from the provided config
+            # Non-overridable to ensure consistency
             "model": self._litellm_model_name,
         }
 

rasa/shared/providers/llm/_base_litellm_client.py

@@ -84,12 +84,15 @@ class _BaseLiteLLMClient:
     @property
     def _completion_fn_args(self) -> dict:
         return {
-            **self._litellm_extra_parameters,
-            "model": self._litellm_model_name,
             # Since all providers covered by LiteLLM use the OpenAI format, but
             # not all support every OpenAI parameter, raise an exception if
             # provider/model uses unsupported parameter
             "drop_params": False,
+            # All other parameters set through config, can override drop_params
+            **self._litellm_extra_parameters,
+            # Model name is constructed in the LiteLLM format from the provided config
+            # Non-overridable to ensure consistency
+            "model": self._litellm_model_name,
         }
 
     def validate_client_setup(self) -> None:

rasa/shared/utils/common.py

@@ -384,7 +384,7 @@ def display_research_study_prompt() -> None:
 {separator}
 Want to help shape the future of Rasa Pro?
 Share your feedback in a short conversation with our team.
-Sign up at: https://calendly.com/alvaro-rasa/rasa-pro-installation
+Sign up at: https://feedback.rasa.com
 {separator}
 """
     print_success(message)

rasa/shared/utils/configs.py

@@ -0,0 +1,110 @@
+from typing import Optional
+
+import structlog
+
+from rasa.shared.utils.io import raise_deprecation_warning
+
+structlogger = structlog.get_logger()
+
+
+def resolve_aliases(config: dict, deprecated_alias_mapping: dict) -> dict:
+    """
+    Resolve aliases in the configuration to standard keys.
+
+    Args:
+        config: Dictionary containing the configuration.
+        deprecated_alias_mapping: Dictionary mapping aliases to
+            their standard keys.
+
+    Returns:
+        New dictionary containing the processed configuration.
+    """
+    config = config.copy()
+
+    for alias, standard_key in deprecated_alias_mapping.items():
+        # We check for the alias instead of the standard key because our goal is to
+        # update the standard key when the alias is found. Since the standard key is
+        # always included in the default component configurations, we overwrite it
+        # with the alias value if the alias exists.
+        if alias in config:
+            config[standard_key] = config.pop(alias)
+
+    return config
+
+
+def raise_deprecation_warnings(
+    config: dict,
+    deprecated_alias_mapping: dict,
+    source: Optional[str] = None,
+) -> None:
+    """
+    Raises warnings for deprecated keys in the configuration.
+
+    Args:
+        config: Dictionary containing the configuration.
+        deprecated_alias_mapping: Dictionary mapping deprecated keys to
+            their standard keys.
+
+    Raises:
+        DeprecationWarning: If any deprecated key is found in the config.
+    """
+    for alias, standard_key in deprecated_alias_mapping.items():
+        if alias in config:
+            source = f"{source}: " or ""
+            raise_deprecation_warning(
+                message=(
+                    f"{source}"
+                    f"'{alias}' is deprecated and will be removed in "
+                    f"4.0.0. Use '{standard_key}' instead."
+                )
+            )
+
+
+def validate_required_keys(config: dict, required_keys: list) -> None:
+    """
+    Validates that the passed config contains all the required keys.
+
+    Args:
+        config: Dictionary containing the configuration.
+        required_keys: List of keys that must be present in the config.
+
+    Raises:
+        ValueError: If any required key is missing.
+    """
+    missing_keys = [key for key in required_keys if key not in config]
+    if missing_keys:
+        message = f"Missing required keys '{missing_keys}' for configuration."
+        structlogger.error(
+            "validate_required_keys",
+            message=message,
+            missing_keys=missing_keys,
+            config=config,
+        )
+        raise ValueError(message)
+
+
+def validate_forbidden_keys(config: dict, forbidden_keys: list) -> None:
+    """
+    Validates that the passed config doesn't contain any forbidden keys.
+
+    Args:
+        config: Dictionary containing the configuration.
+        forbidden_keys: List of keys that are forbidden in the config.
+
+    Raises:
+        ValueError: If any forbidden key is present.
+    """
+    forbidden_keys_in_config = set(config.keys()).intersection(set(forbidden_keys))
+
+    if forbidden_keys_in_config:
+        message = (
+            f"Forbidden keys '{forbidden_keys_in_config}' present "
+            f"in the configuration."
+        )
+        structlogger.error(
+            "validate_forbidden_keys",
+            message=message,
+            forbidden_keys=forbidden_keys_in_config,
+            config=config,
+        )
+        raise ValueError(message)

rasa/shared/utils/constants.py

@@ -2,9 +2,6 @@ DEFAULT_ENCODING = "utf-8"
 
 READ_YAML_FILE_CACHE_MAXSIZE_ENV_VAR = "READ_YAML_FILE_CACHE_MAXSIZE"
 DEFAULT_READ_YAML_FILE_CACHE_MAXSIZE = 256
-RASA_PRO_BETA_PREDICATES_IN_RESPONSE_CONDITIONS_ENV_VAR_NAME = (
-    "RASA_PRO_BETA_PREDICATES_IN_RESPONSE_CONDITIONS"
-)
 
 LOG_COMPONENT_SOURCE_METHOD_INIT = "init"
 LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON = "fingerprint_addon"