rasa-pro 3.13.0.dev9__py3-none-any.whl → 3.13.0.dev10__py3-none-any.whl

rasa/core/policies/enterprise_search_policy_config.py

@@ -0,0 +1,242 @@
+from __future__ import annotations
+
+from dataclasses import asdict, dataclass
+from typing import Any, Dict, List, Optional
+
+import structlog
+
+from rasa.core.constants import (
+    POLICY_MAX_HISTORY,
+    POLICY_PRIORITY,
+    SEARCH_POLICY_PRIORITY,
+)
+from rasa.shared.constants import (
+    EMBEDDINGS_CONFIG_KEY,
+    LLM_CONFIG_KEY,
+    MAX_COMPLETION_TOKENS_CONFIG_KEY,
+    MAX_RETRIES_CONFIG_KEY,
+    MODEL_CONFIG_KEY,
+    OPENAI_PROVIDER,
+    PROMPT_CONFIG_KEY,
+    PROMPT_TEMPLATE_CONFIG_KEY,
+    PROVIDER_CONFIG_KEY,
+    TEMPERATURE_CONFIG_KEY,
+    TIMEOUT_CONFIG_KEY,
+)
+from rasa.shared.utils.configs import (
+    raise_deprecation_warnings,
+    resolve_aliases,
+    validate_forbidden_keys,
+    validate_required_keys,
+)
+from rasa.shared.utils.llm import (
+    DEFAULT_OPENAI_CHAT_MODEL_NAME,
+    DEFAULT_OPENAI_EMBEDDING_MODEL_NAME,
+    resolve_model_client_config,
+)
+
+structlogger = structlog.get_logger()
+
+
+SOURCE_PROPERTY = "source"
+VECTOR_STORE_TYPE_PROPERTY = "type"
+VECTOR_STORE_PROPERTY = "vector_store"
+VECTOR_STORE_THRESHOLD_PROPERTY = "threshold"
+TRACE_TOKENS_PROPERTY = "trace_prompt_tokens"
+CITATION_ENABLED_PROPERTY = "citation_enabled"
+USE_LLM_PROPERTY = "use_generative_llm"
+CHECK_RELEVANCY_PROPERTY = "check_relevancy"
+MAX_MESSAGES_IN_QUERY_KEY = "max_messages_in_query"
+
+DEFAULT_VECTOR_STORE_TYPE = "faiss"
+DEFAULT_VECTOR_STORE_THRESHOLD = 0.0
+DEFAULT_VECTOR_STORE = {
+    VECTOR_STORE_TYPE_PROPERTY: DEFAULT_VECTOR_STORE_TYPE,
+    SOURCE_PROPERTY: "./docs",
+    VECTOR_STORE_THRESHOLD_PROPERTY: DEFAULT_VECTOR_STORE_THRESHOLD,
+}
+
+DEFAULT_CHECK_RELEVANCY_PROPERTY = False
+DEFAULT_USE_LLM_PROPERTY = True
+DEFAULT_CITATION_ENABLED_PROPERTY = False
+DEFAULT_TRACE_PROMPT_TOKEN_PROPERTY = False
+
+DEFAULT_MAX_MESSAGES_IN_QUERY = 2
+
+DEFAULT_LLM_CONFIG = {
+    PROVIDER_CONFIG_KEY: OPENAI_PROVIDER,
+    MODEL_CONFIG_KEY: DEFAULT_OPENAI_CHAT_MODEL_NAME,
+    TIMEOUT_CONFIG_KEY: 10,
+    TEMPERATURE_CONFIG_KEY: 0.0,
+    MAX_COMPLETION_TOKENS_CONFIG_KEY: 256,
+    MAX_RETRIES_CONFIG_KEY: 1,
+}
+
+DEFAULT_EMBEDDINGS_CONFIG = {
+    PROVIDER_CONFIG_KEY: OPENAI_PROVIDER,
+    MODEL_CONFIG_KEY: DEFAULT_OPENAI_EMBEDDING_MODEL_NAME,
+}
+
+DEFAULT_ENTERPRISE_SEARCH_CONFIG = {
+    POLICY_PRIORITY: SEARCH_POLICY_PRIORITY,
+    VECTOR_STORE_PROPERTY: DEFAULT_VECTOR_STORE,
+}
+
+REQUIRED_KEYS: List[str] = []
+
+FORBIDDEN_KEYS: List[str] = []
+
+DEPRECATED_ALIASES_TO_STANDARD_KEY_MAPPING = {
+    PROMPT_CONFIG_KEY: PROMPT_TEMPLATE_CONFIG_KEY
+}
+
+
+@dataclass
+class EnterpriseSearchPolicyConfig:
+    """Parses configuration for Enterprise Search Policy."""
+
+    # TODO: llm_config, embeddings_config, and vector_store_config should also be parsed
+    #   as "Config" objects. Likely part of a broader Rasa 4.0 rewrite where all
+    #   components rely on configuration parser. So, for example, llm_config and
+    #   embeddings_config should be parsed as ClientConfig objects, and
+    #   vector_store_config parsed as VectorStoreConfig object.
+    llm_config: dict
+    embeddings_config: dict
+    vector_store_config: dict
+
+    prompt_template: str
+
+    use_generative_llm: bool = DEFAULT_USE_LLM_PROPERTY
+    enable_citation: bool = DEFAULT_CITATION_ENABLED_PROPERTY
+    check_relevancy: bool = DEFAULT_CHECK_RELEVANCY_PROPERTY
+
+    max_history: Optional[int] = None
+    max_messages_in_query: int = DEFAULT_MAX_MESSAGES_IN_QUERY
+    trace_prompt_tokens: bool = DEFAULT_TRACE_PROMPT_TOKEN_PROPERTY
+
+    @property
+    def vector_store_type(self) -> str:
+        # TODO: In the future this should ideally be part of the Vector config
+        #       and not the property of the EnterpriseSearch config
+        return (
+            self.vector_store_config.get(VECTOR_STORE_TYPE_PROPERTY)
+            or DEFAULT_VECTOR_STORE_TYPE
+        )
+
+    @property
+    def vector_store_threshold(self) -> float:
+        # TODO: In the future this should ideally be part of the Vector config
+        #       and not the property of the EnterpriseSearch config
+        return (
+            self.vector_store_config.get(VECTOR_STORE_THRESHOLD_PROPERTY)
+            or DEFAULT_VECTOR_STORE_THRESHOLD
+        )
+
+    @property
+    def vector_store_source(self) -> Optional[str]:
+        # TODO: In the future this should ideally be part of the Vector config
+        #       and not the property of the EnterpriseSearch config
+        return self.vector_store_config.get(SOURCE_PROPERTY)
+
+    def __post_init__(self) -> None:
+        if self.check_relevancy and not self.use_generative_llm:
+            structlogger.warning(
+                "enterprise_search_policy"
+                ".relevancy_check_enabled_with_disabled_generative_search",
+                event_info=(
+                    f"The config parameter '{CHECK_RELEVANCY_PROPERTY}' is set to"
+                    f"'True', but the generative search is disabled (config"
+                    f"parameter '{USE_LLM_PROPERTY}' is set to 'False'). As a result, "
+                    "the relevancy check for the generative search will be disabled. "
+                    f"To use this check, set the config parameter '{USE_LLM_PROPERTY}' "
+                    f"to `True`."
+                ),
+            )
+        if self.enable_citation and not self.use_generative_llm:
+            structlogger.warning(
+                "enterprise_search_policy"
+                ".citation_enabled_with_disabled_generative_search",
+                event_info=(
+                    f"The config parameter '{CITATION_ENABLED_PROPERTY}' is set to"
+                    f"'True', but the generative search is disabled (config"
+                    f"parameter '{USE_LLM_PROPERTY}' is set to 'False'). As a result, "
+                    "the citation for the generative search will be disabled. "
+                    f"To use this check, set the config parameter '{USE_LLM_PROPERTY}' "
+                    f"to `True`."
+                ),
+            )
+
+    @classmethod
+    def from_dict(cls, config: dict) -> EnterpriseSearchPolicyConfig:
+        """
+        Initializes a dataclass from the passed config.
+
+        Args:
+            config: (dict) The config from which to initialize.
+
+        Raises:
+            ValueError: Config is missing required keys.
+
+        Returns:
+            AzureOpenAIClientConfig
+        """
+        # Resolve LLM config
+        llm_config = (
+            resolve_model_client_config(
+                config.get(LLM_CONFIG_KEY), EnterpriseSearchPolicyConfig.__name__
+            )
+            or DEFAULT_LLM_CONFIG
+        )
+
+        # Resolve embeddings config
+        embeddings_config = (
+            resolve_model_client_config(
+                config.get(EMBEDDINGS_CONFIG_KEY), EnterpriseSearchPolicyConfig.__name__
+            )
+            or DEFAULT_EMBEDDINGS_CONFIG
+        )
+
+        # Vector store config
+        vector_store_config = config.get(VECTOR_STORE_PROPERTY, DEFAULT_VECTOR_STORE)
+
+        # Check for deprecated keys
+        raise_deprecation_warnings(
+            config, DEPRECATED_ALIASES_TO_STANDARD_KEY_MAPPING, "EnterpriseSearchPolicy"
+        )
+        # Resolve any potential aliases (e.g. 'prompt_template' vs 'prompt')
+        config = cls.resolve_config_aliases(config)
+
+        # Validate that the required keys are present
+        validate_required_keys(config, REQUIRED_KEYS)
+        # Validate that the forbidden keys are not present
+        validate_forbidden_keys(config, FORBIDDEN_KEYS)
+
+        this = EnterpriseSearchPolicyConfig(
+            llm_config=llm_config,
+            embeddings_config=embeddings_config,
+            vector_store_config=vector_store_config,
+            prompt_template=config.get(PROMPT_TEMPLATE_CONFIG_KEY),
+            use_generative_llm=config.get(USE_LLM_PROPERTY, DEFAULT_USE_LLM_PROPERTY),
+            enable_citation=config.get(
+                CITATION_ENABLED_PROPERTY, DEFAULT_CITATION_ENABLED_PROPERTY
+            ),
+            check_relevancy=config.get(
+                CHECK_RELEVANCY_PROPERTY, DEFAULT_CHECK_RELEVANCY_PROPERTY
+            ),
+            max_history=config.get(POLICY_MAX_HISTORY),
+            max_messages_in_query=config.get(
+                MAX_MESSAGES_IN_QUERY_KEY, DEFAULT_MAX_MESSAGES_IN_QUERY
+            ),
+            trace_prompt_tokens=config.get(
+                TRACE_TOKENS_PROPERTY, DEFAULT_TRACE_PROMPT_TOKEN_PROPERTY
+            ),
+        )
+        return this
+
+    def to_dict(self) -> dict:
+        """Converts the config instance into a dictionary."""
+        return asdict(self)
+
+    @staticmethod
+    def resolve_config_aliases(config: Dict[str, Any]) -> Dict[str, Any]:
+        return resolve_aliases(config, DEPRECATED_ALIASES_TO_STANDARD_KEY_MAPPING)

rasa/dialogue_understanding/generator/prompt_templates/command_prompt_v3_claude_3_5_sonnet_20240620_template.jinja2

@@ -0,0 +1,78 @@
+## Task Description
+Your task is to analyze the current conversation context and generate a list of actions to start new business processes that we call flows, to extract slots, or respond to off-topic and knowledge requests.
+
+---
+
+## Available Actions:
+* `start flow flow_name`: Start a flow. For example, `start flow transfer_money` or `start flow list_contacts`.
+* `set slot slot_name slot_value`: Set a slot for the active flow. For example, `set slot transfer_money_recipient Freddy`. Can be used to correct and change previously set values.
+* `disambiguate flows flow_name1 flow_name2 ... flow_name_n`: When a message could refer to multiple flows, list the possible flows as options to clarify. Example: `disambiguate flows list_contacts add_contact remove_contact`.
+* `search and reply`: Provide a response from the knowledge base to address the user's inquiry when no flows fit, including domain knowledge, FAQs, and all off-topic or social messages.
+* `cancel flow`: Cancel the current flow if the user requests it.
+
+---
+
+## General Instructions
+### Start Flow
+* Only start a flow if the user's message is clear and fully addressed by that flow's description and purpose.
+* Pay close attention to exact wording and scope in the flow description — do not assume or “stretch” the intended use of a flow.
+### Set Slot
+* Do not fill slots with abstract values or placeholders.
+* For categorical slots, try to match the user message with allowed slot values. Use "other" if you cannot match it.
+* Set the boolean slots based on the user's response. Map positive responses to `True`, and negative to `False`.
+* Extract text slot values exactly as provided by the user. Avoid assumptions, format changes, or partial extractions.
+### Disambiguate Flows
+* Use `disambiguate flows` when the user's message matches multiple flows and you cannot decide which flow is most appropriate.
+* If the user message is short and not precise enough to start a flow or `search and reply`, disambiguate.
+* If a single flow is a strong/plausible fit, prefer starting that flow directly.
+* If a user's message unambiguously and distinctly matches multiple flows, start all relevant flows at once (rather than disambiguating).
+### Search and Reply
+* Only start `search and reply` if the user intent is clear.
+* Flow Priority: If you are unsure between starting a flow or `search and reply`, always prioritize starting a flow.
+### Cancel Flow
+* Do not cancel any flow unless the user explicitly requests it.
+* Multiple flows can be started without cancelling the previous, if the user wants to pursue multiple processes.
+### General Tips
+* Only use information provided by the user.
+* Strictly adhere to the provided action format.
+* Focus on the last message and take it one step at a time.
+* Use the previous conversation steps only to aid understanding.
+
+---
+
+## Decision Rule Table
+| Condition                                             | Action             |
+|-------------------------------------------------------|--------------------|
+| Flow perfectly matches user's message                 | start flow         |
+| Multiple flows are equally strong, relevant matches   | disambiguate flows |
+| User's message is unclear or imprecise                | disambiguate flows |
+| No flow fits at all, but knowledge base may help      | search and reply   |
+
+---
+
+## Available Flows and Slots
+Use the following structured data:
+```json
+{"flows":[{% for flow in available_flows %}{"name":"{{ flow.name }}","description":{{ flow.description | to_json_escaped_string }}{% if flow.slots %},"slots":[{% for slot in flow.slots %}{"name":"{{ slot.name }}"{% if slot.description %},"description":{{ slot.description | to_json_escaped_string }}{% endif %}{% if slot.allowed_values %},"allowed_values":{{ slot.allowed_values }}{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]}
+```
+
+---
+
+## Current State
+{% if current_flow != None %}Use the following structured data:
+```json
+{"active_flow":"{{ current_flow }}","current_step":{"requested_slot":"{{ current_slot }}","requested_slot_description":{{ current_slot_description | to_json_escaped_string }}},"slots":[{% for slot in flow_slots %}{"name":"{{ slot.name }}","value":"{{ slot.value }}","type":"{{ slot.type }}"{% if slot.description %},"description":{{ slot.description | to_json_escaped_string }}{% endif %}{% if slot.allowed_values %},"allowed_values":"{{ slot.allowed_values }}"{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]}
+```{% else %}
+You are currently not inside any flow.{% endif %}
+
+---
+
+## Conversation History
+{{ current_conversation }}
+
+---
+
+## Task
+Create an action list with one action per line in response to the user's last message: """{{ user_message }}""".
+
+Your action list:

rasa/dialogue_understanding/generator/single_step/search_ready_llm_command_generator.py

@@ -59,10 +59,10 @@ MODEL_PROMPT_MAPPER = {
     ),
     f"{AWS_BEDROCK_PROVIDER}/anthropic."
     f"{MODEL_NAME_CLAUDE_3_5_SONNET_20240620}-v1:0": (
-        "command_prompt_v2_claude_3_5_sonnet_20240620_template.jinja2"
+        "command_prompt_v3_claude_3_5_sonnet_20240620_template.jinja2"
     ),
     f"{ANTHROPIC_PROVIDER}/{MODEL_NAME_CLAUDE_3_5_SONNET_20240620}": (
-        "command_prompt_v2_claude_3_5_sonnet_20240620_template.jinja2"
+        "command_prompt_v3_claude_3_5_sonnet_20240620_template.jinja2"
     ),
 }
 

rasa/shared/core/flows/validation.py

@@ -581,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)
 

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/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/tracing/instrumentation/attribute_extractors.py

@@ -64,7 +64,10 @@ from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.core.training_data.structures import StoryGraph
 from rasa.shared.importers.importer import TrainingDataImporter
 from rasa.shared.nlu.constants import INTENT_NAME_KEY, SET_SLOT_COMMAND
-from rasa.shared.utils.llm import combine_custom_and_default_config
+from rasa.shared.utils.llm import (
+    combine_custom_and_default_config,
+    resolve_model_client_config,
+)
 from rasa.tracing.constants import (
     PROMPT_TOKEN_LENGTH_ATTRIBUTE_NAME,
     REQUEST_BODY_SIZE_IN_BYTES_ATTRIBUTE_NAME,
@@ -335,9 +338,8 @@ def extract_llm_config(
     else:
         config = self.config
 
-    llm_property = combine_custom_and_default_config(
-        config.get(LLM_CONFIG_KEY), default_llm_config
-    )
+    llm_config = resolve_model_client_config(config.get(LLM_CONFIG_KEY))
+    llm_property = combine_custom_and_default_config(llm_config, default_llm_config)
 
     if isinstance(self, LLMBasedCommandGenerator):
         flow_retrieval_config = config.get(FLOW_RETRIEVAL_KEY, {}) or {}
@@ -346,8 +348,11 @@ def extract_llm_config(
             default_embeddings_config,
         )
     else:
+        embeddings_config = resolve_model_client_config(
+            config.get(EMBEDDINGS_CONFIG_KEY)
+        )
         embeddings_property = combine_custom_and_default_config(
-            config.get(EMBEDDINGS_CONFIG_KEY), default_embeddings_config
+            embeddings_config, default_embeddings_config
         )
 
     attributes = {