rasa-pro 3.13.0.dev2__py3-none-any.whl → 3.13.0.dev3__py3-none-any.whl

rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py

@@ -52,6 +52,10 @@ from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.nlu.constants import TEXT
 from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.providers.llm.llm_response import LLMResponse
+from rasa.shared.utils.constants import (
+    LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,
+    LOG_COMPONENT_SOURCE_METHOD_INIT,
+)
 from rasa.shared.utils.io import deep_container_fingerprint, raise_deprecation_warning
 from rasa.shared.utils.llm import (
     allowed_values_for_slot,
@@ -330,6 +334,8 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
         return get_prompt_template(
             config.get("prompt_templates", {}).get(key, {}).get(FILE_PATH_KEY),
             default_value,
+            log_source_component=MultiStepLLMCommandGenerator.__name__,
+            log_source_method=LOG_COMPONENT_SOURCE_METHOD_INIT,
         )
 
     @classmethod
@@ -786,17 +792,24 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
     @classmethod
     def fingerprint_addon(cls, config: Dict[str, Any]) -> Optional[str]:
         """Add a fingerprint for the graph."""
+        get_prompt_template_log_params = {
+            "log_source_component": MultiStepLLMCommandGenerator.__name__,
+            "log_source_method": LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,
+        }
+
         handle_flows_template = get_prompt_template(
             config.get("prompt_templates", {})
             .get(HANDLE_FLOWS_KEY, {})
             .get(FILE_PATH_KEY),
             DEFAULT_HANDLE_FLOWS_TEMPLATE,
+            **get_prompt_template_log_params,
         )
         fill_slots_template = get_prompt_template(
             config.get("prompt_templates", {})
             .get(FILL_SLOTS_KEY, {})
             .get(FILE_PATH_KEY),
             DEFAULT_FILL_SLOTS_TEMPLATE,
+            **get_prompt_template_log_params,
         )
 
         llm_config = resolve_model_client_config(

rasa/dialogue_understanding/generator/prompt_templates/command_prompt_template.jinja2

@@ -57,4 +57,4 @@ Strictly adhere to the provided action types listed above.
 Focus on the last message and take it one step at a time.
 Use the previous conversation steps only to aid understanding.
 
-Your action list:
+Your action list:

rasa/dialogue_understanding/generator/prompt_templates/command_prompt_v2_claude_3_5_sonnet_20240620_template.jinja2

@@ -8,7 +8,7 @@ Your task is to analyze the current conversation context and generate a list of
 * `set slot slot_name slot_value`: Slot setting. For example, `set slot transfer_money_recipient Freddy`. Can be used to correct and change previously set values.
 * `cancel flow`: Cancelling the current flow.
 * `disambiguate flows flow_name1 flow_name2 ... flow_name_n`: Disambiguate which flow should be started when user input is ambiguous by listing the potential flows as options. For example, `disambiguate flows list_contacts add_contact remove_contact ...` if the user just wrote "contacts".
-* `search and reply`: Responding to the user's questions by supplying relevant information, such as answering FAQs or explaining services.
+* `provide info`: Responding to the user's questions by supplying relevant information, such as answering FAQs or explaining services.
 * `offtopic reply`: Responding to casual or social user messages that are unrelated to any flows, engaging in friendly conversation and addressing off-topic remarks.
 * `hand over`: Handing over to a human, in case the user seems frustrated or explicitly asks to speak to one.
 

rasa/dialogue_understanding/generator/prompt_templates/command_prompt_v2_gpt_4o_2024_11_20_template.jinja2

@@ -16,9 +16,7 @@ Use the following structured data:
 * `set slot slot_name slot_value`: Slot setting. For example, `set slot transfer_money_recipient Freddy`. Can be used to correct and change previously set values.
 * `cancel flow`: Cancelling the current flow.
 * `disambiguate flows flow_name1 flow_name2 ... flow_name_n`: Disambiguate which flow should be started when user input is ambiguous by listing the potential flows as options. For example, `disambiguate flows list_contacts add_contact remove_contact ...` if the user just wrote "contacts".
-{%- if relevant_documents.results %}
-* `search and reply`: Responding to the user's message by using the relevant FAQs (included in this prompt) retrieved from the knowledge base.
-{%- endif %}
+* `provide info`: Responding to the user's questions by supplying relevant information, such as answering FAQs or explaining services.
 * `offtopic reply`: Responding to casual or social user messages that are unrelated to any flows, engaging in friendly conversation and addressing off-topic remarks.
 * `hand over`: Handing over to a human, in case the user seems frustrated or explicitly asks to speak to one.
 
@@ -29,36 +27,16 @@ Use the following structured data:
 * 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 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.
-* Use clarification in ambiguous cases.
-* Use `disambiguate flows` only when multiple flows could fit the same message (e.g., "card" could mean `block_card` or `replace_card`).
-{%- if relevant_documents.results %}
-* A user asking a question does not automatically imply that they want `search and reply`. The objective is to help them complete a business process if its possible to do so via a flow.
-* **Flow Priority**: If a user message can be addressed by starting a flow (even if it looks like a general question), ALWAYS start the flow first. Example: If the user says "How do I activate my card?", use `start flow activate_card` instead of `search and reply`. Only use `search and reply` if no flow matches the request.
-{%- endif %}
 * Only use information provided by the user.
+* Use clarification in ambiguous cases.
 * Multiple flows can be started. If a user wants to digress into a second flow, you do not need to cancel the current flow.
 * Do not cancel the flow unless the user explicitly requests it.
 * 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.
 
-{%- if relevant_documents.results %}
-
----
-
-## Relevant FAQs from the knowledge base
-```json
-{"documents":[{% for document in relevant_documents.results %}{"Q":"{{ document.text }}","A":"{{ document.metadata.answer }}"},{% endfor %}]}
-```
-
----
-
-{% else %}
-
 ---
 
-{% endif -%}
-
 ## Current State
 {% if current_flow != None %}Use the following structured data:
 ```json

rasa/dialogue_understanding/generator/single_step/compact_llm_command_generator.py

@@ -1,10 +1,9 @@
 import copy
-from typing import Any, Dict, List, Optional, Text
+from typing import Any, Dict, List, Literal, Optional, Text
 
 import structlog
 
 import rasa.shared.utils.io
-from rasa.core.information_retrieval import SearchResultList
 from rasa.dialogue_understanding.commands import (
     CannotHandleCommand,
     Command,
@@ -39,7 +38,6 @@ from rasa.dialogue_understanding.utils import (
     add_commands_to_message_parse_data,
     add_prompt_to_message_parse_data,
 )
-from rasa.document_retrieval.constants import POST_PROCESSED_DOCUMENTS_KEY
 from rasa.engine.graph import ExecutionContext
 from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
@@ -60,6 +58,10 @@ from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.nlu.constants import LLM_COMMANDS, LLM_PROMPT, TEXT
 from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.providers.llm.llm_response import LLMResponse
+from rasa.shared.utils.constants import (
+    LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,
+    LOG_COMPONENT_SOURCE_METHOD_INIT,
+)
 from rasa.shared.utils.io import deep_container_fingerprint
 from rasa.shared.utils.llm import (
     allowed_values_for_slot,
@@ -189,8 +191,8 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
         )
 
         # Get the prompt template from the config or the default prompt template.
-        self.prompt_template = self.resolve_component_prompt_template(
-            self.config, prompt_template
+        self.prompt_template = self._resolve_component_prompt_template(
+            self.config, prompt_template, log_context=LOG_COMPONENT_SOURCE_METHOD_INIT
         )
 
         # Set the command syntax version to v2
@@ -495,10 +497,6 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
         latest_user_message = sanitize_message_for_prompt(message.get(TEXT))
         current_conversation += f"\nUSER: {latest_user_message}"
 
-        relevant_documents = SearchResultList.from_dict(
-            message.get(POST_PROCESSED_DOCUMENTS_KEY, [])
-        )
-
         inputs = {
             "available_flows": self.prepare_flows_for_template(
                 startable_flows, tracker
@@ -512,7 +510,6 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
             "current_slot_allowed_values": current_slot_allowed_values,
             "user_message": latest_user_message,
             "is_repeat_command_enabled": self.repeat_command_enabled,
-            "relevant_documents": relevant_documents,
         }
 
         return self.compile_template(self.prompt_template).render(**inputs)
@@ -546,7 +543,9 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
         # and update the llm config with the resolved llm config.
         _config_copy = copy.deepcopy(config)
         _config_copy[LLM_CONFIG_KEY] = llm_config
-        prompt_template = cls.resolve_component_prompt_template(_config_copy)
+        prompt_template = cls._resolve_component_prompt_template(
+            _config_copy, log_context=LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON
+        )
 
         return deep_container_fingerprint(
             [prompt_template, llm_config, embedding_config]
@@ -562,20 +561,26 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
         return CommandSyntaxVersion.v2
 
     @staticmethod
-    def resolve_component_prompt_template(
-        config: Dict[str, Any], prompt_template: Optional[str] = None
+    def _resolve_component_prompt_template(
+        config: Dict[str, Any],
+        prompt_template: Optional[str] = None,
+        log_context: Optional[Literal["init", "fingerprint_addon"]] = None,
     ) -> Optional[str]:
         """Get the prompt template from the config or the default prompt template."""
         # Get the default prompt template based on the model name.
         default_command_prompt_template = get_default_prompt_template_based_on_model(
-            config.get(LLM_CONFIG_KEY, {}) or {},
-            MODEL_PROMPT_MAPPER,
-            DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME,
-            FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME,
+            llm_config=config.get(LLM_CONFIG_KEY, {}) or {},
+            model_prompt_mapping=MODEL_PROMPT_MAPPER,
+            default_prompt_path=DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME,
+            fallback_prompt_path=FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME,
+            log_source_component=CompactLLMCommandGenerator.__name__,
+            log_source_method=log_context,
         )
 
         # Return the prompt template either from the config or the default prompt.
         return prompt_template or get_prompt_template(
             config.get(PROMPT_TEMPLATE_CONFIG_KEY),
             default_command_prompt_template,
+            log_source_component=CompactLLMCommandGenerator.__name__,
+            log_source_method=log_context,
         )

rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py

@@ -1,5 +1,5 @@
 import importlib.resources
-from typing import Any, Dict, Optional, Text
+from typing import Any, Dict, Literal, Optional, Text
 
 import structlog
 
@@ -25,8 +25,12 @@ from rasa.shared.constants import (
     PROMPT_CONFIG_KEY,
     PROMPT_TEMPLATE_CONFIG_KEY,
 )
+from rasa.shared.utils.constants import LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON
 from rasa.shared.utils.io import deep_container_fingerprint
-from rasa.shared.utils.llm import get_prompt_template, resolve_model_client_config
+from rasa.shared.utils.llm import (
+    get_prompt_template,
+    resolve_model_client_config,
+)
 
 DEFAULT_COMMAND_PROMPT_TEMPLATE = importlib.resources.read_text(
     "rasa.dialogue_understanding.generator.prompt_templates",
@@ -72,9 +76,6 @@ class SingleStepLLMCommandGenerator(CompactLLMCommandGenerator):
                     "Please use the config parameter 'prompt_template' instead. "
                 ),
             )
-        self.prompt_template = self.resolve_component_prompt_template(
-            config, prompt_template
-        )
 
         # Set the command syntax version to v1
         CommandSyntaxManager.set_syntax_version(
@@ -95,7 +96,9 @@ class SingleStepLLMCommandGenerator(CompactLLMCommandGenerator):
     @classmethod
     def fingerprint_addon(cls: Any, config: Dict[str, Any]) -> Optional[str]:
         """Add a fingerprint for the graph."""
-        prompt_template = cls.resolve_component_prompt_template(config)
+        prompt_template = cls._resolve_component_prompt_template(
+            config, log_context=LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON
+        )
         llm_config = resolve_model_client_config(
             config.get(LLM_CONFIG_KEY), SingleStepLLMCommandGenerator.__name__
         )
@@ -117,17 +120,29 @@ class SingleStepLLMCommandGenerator(CompactLLMCommandGenerator):
         return CommandSyntaxVersion.v1
 
     @staticmethod
-    def resolve_component_prompt_template(
-        config: Dict[str, Any], prompt_template: Optional[str] = None
+    def _resolve_component_prompt_template(
+        config: Dict[str, Any],
+        prompt_template: Optional[str] = None,
+        log_context: Optional[Literal["init", "fingerprint_addon"]] = None,
     ) -> Optional[str]:
         """Get the prompt template from the config or the default prompt template."""
-        # Get the default prompt template based on the model name.
-        config_prompt = (
+        # Case when model is being loaded
+        if prompt_template is not None:
+            return prompt_template
+
+        # The prompt can be configured in the config via the "prompt" (deprecated) or
+        # "prompt_template" properties
+        prompt_template_path = (
             config.get(PROMPT_CONFIG_KEY)
             or config.get(PROMPT_TEMPLATE_CONFIG_KEY)
             or None
         )
-        return prompt_template or get_prompt_template(
-            config_prompt,
+
+        # Try to load the template from the given path or fallback to the default for
+        # the component
+        return get_prompt_template(
+            prompt_template_path,
             DEFAULT_COMMAND_PROMPT_TEMPLATE,
+            log_source_component=SingleStepLLMCommandGenerator.__name__,
+            log_source_method=log_context,
         )

rasa/dialogue_understanding_test/io.py

@@ -329,19 +329,14 @@ def print_prompt(step: FailedTestStep) -> None:
             rich.print(
                 f"[bold]  prompt name      [/bold]: {prompt_data[KEY_PROMPT_NAME]}"
             )
-            if KEY_PROMPT_TOKENS in prompt_data:
-                rich.print(
-                    f"[bold]  prompt tokens    [/bold]: {prompt_data[KEY_PROMPT_TOKENS]}"  # noqa: E501
-                )
-            if KEY_COMPLETION_TOKENS in prompt_data:
-                rich.print(
-                    f"[bold]  completion tokens[/bold]: "
-                    f"{prompt_data[KEY_COMPLETION_TOKENS]}"
-                )
-            if KEY_LATENCY in prompt_data:
-                rich.print(
-                    f"[bold]  latency          [/bold]: {prompt_data[KEY_LATENCY]}"
-                )
+            rich.print(
+                f"[bold]  prompt tokens    [/bold]: {prompt_data[KEY_PROMPT_TOKENS]}"
+            )
+            rich.print(
+                f"[bold]  completion tokens[/bold]: "
+                f"{prompt_data[KEY_COMPLETION_TOKENS]}"
+            )
+            rich.print(f"[bold]  latency          [/bold]: {prompt_data[KEY_LATENCY]}")
             if KEY_SYSTEM_PROMPT in prompt_data:
                 rich.print(
                     f"[bold]  system prompt    [/bold]: "

rasa/e2e_test/utils/validation.py

@@ -7,6 +7,7 @@ import structlog
 import rasa.shared.utils.io
 from rasa.e2e_test.constants import SCHEMA_FILE_PATH
 from rasa.e2e_test.e2e_test_case import Fixture, Metadata
+from rasa.exceptions import ModelNotFound
 from rasa.shared.utils.yaml import read_schema_file
 
 if TYPE_CHECKING:
@@ -152,10 +153,9 @@ def validate_model_path(model_path: Optional[str], parameter: str, default: str)
         return model_path
 
     if model_path and not Path(model_path).exists():
-        rasa.shared.utils.io.raise_warning(
+        raise ModelNotFound(
             f"The provided model path '{model_path}' could not be found. "
-            f"Using default location '{default}' instead.",
-            UserWarning,
+            "Provide an existing model path."
         )
 
     elif model_path is None:

rasa/engine/recipes/default_components.py

@@ -13,7 +13,6 @@ from rasa.dialogue_understanding.generator import (
     LLMCommandGenerator,
 )
 from rasa.dialogue_understanding.generator.nlu_command_adapter import NLUCommandAdapter
-from rasa.document_retrieval.document_retriever import DocumentRetriever
 from rasa.nlu.classifiers.diet_classifier import DIETClassifier
 from rasa.nlu.classifiers.fallback_classifier import FallbackClassifier
 from rasa.nlu.classifiers.keyword_intent_classifier import KeywordIntentClassifier
@@ -93,5 +92,4 @@ DEFAULT_COMPONENTS = [
     FlowPolicy,
     EnterpriseSearchPolicy,
     IntentlessPolicy,
-    DocumentRetriever,
 ]

rasa/llm_fine_tuning/paraphrasing/conversation_rephraser.py

@@ -19,6 +19,7 @@ from rasa.shared.constants import (
 )
 from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.providers.mappings import OPENAI_PROVIDER
+from rasa.shared.utils.constants import LOG_COMPONENT_SOURCE_METHOD_INIT
 from rasa.shared.utils.llm import (
     USER,
     get_prompt_template,
@@ -54,6 +55,8 @@ class ConversationRephraser:
         self.prompt_template = get_prompt_template(
             self.config.get(PROMPT_TEMPLATE_CONFIG_KEY),
             DEFAULT_REPHRASING_PROMPT_TEMPLATE,
+            log_source_component=ConversationRephraser.__name__,
+            log_source_method=LOG_COMPONENT_SOURCE_METHOD_INIT,
         )
 
     @staticmethod

rasa/shared/utils/constants.py

@@ -5,3 +5,6 @@ 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"

rasa/shared/utils/llm.py

@@ -1,5 +1,6 @@
 import importlib.resources
 import json
+import logging
 from copy import deepcopy
 from functools import wraps
 from typing import (
@@ -7,6 +8,7 @@ from typing import (
     Any,
     Callable,
     Dict,
+    Literal,
     Optional,
     Text,
     Type,
@@ -59,6 +61,7 @@ from rasa.shared.providers.mappings import (
     get_embedding_client_from_provider,
     get_llm_client_from_provider,
 )
+from rasa.shared.utils.constants import LOG_COMPONENT_SOURCE_METHOD_INIT
 
 if TYPE_CHECKING:
     from rasa.shared.core.trackers import DialogueStateTracker
@@ -654,35 +657,59 @@ def embedder_client_factory(
 
 
 def get_prompt_template(
-    jinja_file_path: Optional[Text], default_prompt_template: Text
+    jinja_file_path: Optional[Text],
+    default_prompt_template: Text,
+    *,
+    log_source_component: Optional[Text] = None,
+    log_source_method: Optional[Literal["init", "fingerprint_addon"]] = None,
 ) -> Text:
     """Returns the jinja template.
 
     Args:
-        jinja_file_path: the path to the jinja file
-        default_prompt_template: the default prompt template
+        jinja_file_path: The path to the jinja template file. If not provided, the
+            default template will be used.
+        default_prompt_template: The fallback prompt template to use if no file is
+            found or specified.
+        log_source_component: The name of the component emitting the log, used to
+            identify the source in structured logging.
+        log_source_method: The name of the method or function emitting the log for
+            better traceability.
 
     Returns:
         The prompt template.
     """
+
     try:
         if jinja_file_path is not None:
             prompt_template = rasa.shared.utils.io.read_file(jinja_file_path)
-            structlogger.info(
-                "utils.llm.get_prompt_template.custom_prompt_template_read_successfull",
+
+            log_level = (
+                logging.INFO
+                if log_source_method == LOG_COMPONENT_SOURCE_METHOD_INIT
+                else logging.DEBUG
+            )
+
+            structlogger.log(
+                log_level,
+                "utils.llm.get_prompt_template"
+                ".custom_prompt_template_read_successfully",
                 event_info=(
                     f"Custom prompt template read successfully from "
                     f"`{jinja_file_path}`."
                 ),
                 prompt_file_path=jinja_file_path,
+                log_source_component=log_source_component,
+                log_source_method=log_source_method,
             )
             return prompt_template
     except (FileIOException, FileNotFoundException):
         structlogger.warning(
-            "utils.llm.get_prompt_template.failed_to_read_custom_prompt_template",
+            "utils.llm.get_prompt_template" ".failed_to_read_custom_prompt_template",
             event_info=(
                 "Failed to read custom prompt template. Using default template instead."
             ),
+            log_source_component=log_source_component,
+            log_source_method=log_source_method,
         )
     return default_prompt_template
 
@@ -692,50 +719,66 @@ def get_default_prompt_template_based_on_model(
     model_prompt_mapping: Dict[str, Any],
     default_prompt_path: str,
     fallback_prompt_path: str,
+    *,
+    log_source_component: Optional[Text] = None,
+    log_source_method: Optional[Literal["init", "fingerprint_addon"]] = None,
 ) -> Text:
     """Returns the default prompt template based on the model name.
 
     Args:
         llm_config: The model config.
-        model_prompt_mapping: The mapping of model name to prompt template.
-        default_prompt_path: The default prompt path of the component.
-        fallback_prompt_path: The fallback prompt path for all other models
-            that do not have a mapping in the model_prompt_mapping.
+        model_prompt_mapping: The model name -> prompt template mapping.
+        default_prompt_path: The path to the default prompt template for the component.
+        fallback_prompt_path: The fallback prompt path for all other models that do not
+            have a mapping in the model_prompt_mapping.
+        log_source_component: The name of the component emitting the log, used to
+            identify the source in structured logging.
+        log_source_method: The name of the method or function emitting the log for
+            better traceability.
 
     Returns:
         The default prompt template.
     """
+    # Extract the provider and model name information from the configuration
     _llm_config = deepcopy(llm_config)
     if MODELS_CONFIG_KEY in _llm_config:
         _llm_config = _llm_config[MODELS_CONFIG_KEY][0]
     provider = _llm_config.get(PROVIDER_CONFIG_KEY)
     model = _llm_config.get(MODEL_CONFIG_KEY)
+
+    # If the model is not defined, we default to the default prompt template.
     if not model:
-        # If the model is not defined, we default to the default prompt template.
-        structlogger.info(
-            "utils.llm.get_default_prompt_template_based_on_model.using_default_prompt_template",
+        structlogger.debug(
+            "utils.llm.get_default_prompt_template_based_on_model"
+            ".using_default_prompt_template",
             event_info=(
                 f"Model not defined in the config. Default prompt template read from"
                 f" - `{default_prompt_path}`."
             ),
             default_prompt_path=default_prompt_path,
+            log_source_component=log_source_component,
+            log_source_method=log_source_method,
         )
         return importlib.resources.read_text(
             DEFAULT_PROMPT_PACKAGE_NAME, default_prompt_path
         )
 
-    model_name = model if provider and provider in model else f"{provider}/{model}"
-    if prompt_file_path := model_prompt_mapping.get(model_name):
-        # If the model is found in the mapping, we use the model-specific prompt
-        # template.
-        structlogger.info(
-            "utils.llm.get_default_prompt_template_based_on_model.using_model_specific_prompt_template",
+    full_model_name = model if provider and provider in model else f"{provider}/{model}"
+
+    # If the model is found in the mapping, we use the model-specific prompt
+    # template.
+    if prompt_file_path := model_prompt_mapping.get(full_model_name):
+        structlogger.debug(
+            "utils.llm.get_default_prompt_template_based_on_model"
+            ".using_model_specific_prompt_template",
             event_info=(
                 f"Using model-specific default prompt template. Default prompt "
                 f"template read from - `{prompt_file_path}`."
             ),
             default_prompt_path=prompt_file_path,
-            model_name=model_name,
+            model_name=full_model_name,
+            log_source_component=log_source_component,
+            log_source_method=log_source_method,
         )
         return importlib.resources.read_text(
             DEFAULT_PROMPT_PACKAGE_NAME, prompt_file_path
@@ -743,14 +786,17 @@ def get_default_prompt_template_based_on_model(
 
     # If the model is not found in the mapping, we default to the fallback prompt
     # template.
-    structlogger.info(
-        "utils.llm.get_default_prompt_template_based_on_model.using_fallback_prompt_template",
+    structlogger.debug(
+        "utils.llm.get_default_prompt_template_based_on_model"
+        ".using_fallback_prompt_template",
         event_info=(
             f"Model not found in the model prompt mapping. Fallback prompt template "
             f"read from - `{fallback_prompt_path}`."
         ),
         fallback_prompt_path=fallback_prompt_path,
-        model_name=model_name,
+        model_name=full_model_name,
+        log_source_component=log_source_component,
+        log_source_method=log_source_method,
     )
     return importlib.resources.read_text(
         DEFAULT_PROMPT_PACKAGE_NAME, fallback_prompt_path
@@ -762,7 +808,7 @@ def allowed_values_for_slot(slot: Slot) -> Union[str, None]:
     if isinstance(slot, BooleanSlot):
         return str([True, False])
     if isinstance(slot, CategoricalSlot):
-        return str([v for v in slot.values if v != "__other__"] + ["other"])
+        return str([v for v in slot.values if v != "__other__"])
     else:
         return None
 

rasa/tracing/instrumentation/attribute_extractors.py

@@ -326,7 +326,7 @@ def extract_attrs_for_command(
 def extract_llm_config(
     self: Any,
     default_llm_config: Dict[str, Any],
-    default_embeddings_config: Optional[Dict[str, Any]],
+    default_embeddings_config: Dict[str, Any],
 ) -> Dict[str, Any]:
     if isinstance(self, ContextualResponseRephraser):
         # ContextualResponseRephraser is not a graph component, so it's
@@ -346,12 +346,8 @@ def extract_llm_config(
             default_embeddings_config,
         )
     else:
-        embeddings_property = (
-            combine_custom_and_default_config(
-                config.get(EMBEDDINGS_CONFIG_KEY), default_embeddings_config
-            )
-            if default_embeddings_config is not None
-            else {}
+        embeddings_property = combine_custom_and_default_config(
+            config.get(EMBEDDINGS_CONFIG_KEY), default_embeddings_config
         )
 
     attributes = {
@@ -406,7 +402,7 @@ def extract_attrs_for_contextual_response_rephraser(
         self,
         default_llm_config=DEFAULT_LLM_CONFIG,
         # rephraser is not using embeddings
-        default_embeddings_config=None,
+        default_embeddings_config={},
     )
 
     return extend_attributes_with_prompt_tokens_length(self, attributes, prompt)
@@ -422,7 +418,7 @@ def extract_attrs_for_create_history(
         self,
         default_llm_config=DEFAULT_LLM_CONFIG,
         # rephraser is not using embeddings
-        default_embeddings_config=None,
+        default_embeddings_config={},
     )
 
 
@@ -775,13 +771,14 @@ def extract_attrs_for_enterprise_search_generate_llm_answer(
     self: "EnterpriseSearchPolicy", llm: "BaseLLM", prompt: str
 ) -> Dict[str, Any]:
     from rasa.core.policies.enterprise_search_policy import (
+        DEFAULT_EMBEDDINGS_CONFIG,
         DEFAULT_LLM_CONFIG,
     )
 
     attributes = extract_llm_config(
         self,
         default_llm_config=DEFAULT_LLM_CONFIG,
-        default_embeddings_config=None,
+        default_embeddings_config=DEFAULT_EMBEDDINGS_CONFIG,
     )
 
     return extend_attributes_with_prompt_tokens_length(self, attributes, prompt)