rasa-pro 3.12.21__py3-none-any.whl → 3.13.0__py3-none-any.whl

rasa/shared/providers/_configs/azure_openai_client_config.py

@@ -46,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()
 

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

@@ -26,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,

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/llm/default_litellm_llm_client.py

@@ -101,11 +101,11 @@ class DefaultLiteLLMClient(_BaseLiteLLMClient):
         #       SageMaker) in Rasa by allowing AWS secrets to be provided as extra
         #       parameters without triggering validation errors due to missing AWS
         #       environment variables.
-        if self.provider.lower() in [
+        if self.provider.lower() in {
             AWS_BEDROCK_PROVIDER,
             AWS_SAGEMAKER_PROVIDER,
             AWS_SAGEMAKER_CHAT_PROVIDER,
-        ]:
+        }:
             validate_aws_setup_for_litellm_clients(
                 self._litellm_model_name,
                 self._litellm_extra_parameters,

rasa/shared/utils/common.py

@@ -1,4 +1,5 @@
 import asyncio
+import copy
 import functools
 import importlib
 import inspect
@@ -288,6 +289,47 @@ def merge_lists_of_dicts(
     return list(merged_dicts.values())
 
 
+def partial_merge_list(
+    self_list: List[Any],
+    other_list: List[Any],
+    is_same_item_fn: Callable[[Any, Any], bool],
+) -> List[Any]:
+    """Merges two lists based on a custom intersection logic."""
+    matched_other_indices = set()
+    result = []
+
+    for s_item in self_list:
+        match = next(
+            (
+                (i, o_item)
+                for i, o_item in enumerate(other_list)
+                if i not in matched_other_indices and is_same_item_fn(s_item, o_item)
+            ),
+            None,
+        )
+        if match:
+            i, o_item = match
+            result.append(copy.deepcopy(o_item))
+            matched_other_indices.add(i)
+        else:
+            result.append(copy.deepcopy(s_item))
+
+    return result
+
+
+def partial_merge_dict(
+    self_d: Dict[Text, Any], other_d: Dict[Text, Any]
+) -> Dict[Text, Any]:
+    """Merges two dictionaries based on a custom intersection logic."""
+    merged = {}
+    for k, v in self_d.items():
+        if k in other_d:
+            merged[k] = copy.deepcopy(other_d[k])
+        else:
+            merged[k] = copy.deepcopy(v)
+    return merged
+
+
 def warn_and_exit_if_module_path_contains_rasa_plus(
     module_path: Text, lookup_path: Optional[str] = None
 ) -> None:
@@ -342,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"