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

rasa/core/policies/enterprise_search_policy_config.py

@@ -0,0 +1,241 @@
+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_ENTERPRISE_SEARCH_POLICY_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_ENTERPRISE_SEARCH_POLICY_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/core/policies/enterprise_search_prompt_with_relevancy_check_and_citation_template.jinja2

@@ -1,5 +1,9 @@
-Given the following information, please provide an answer based on the provided documents and the context of the recent conversation.
-If the answer is not known or cannot be determined from the provided documents or context, please state that you do not know to the user.
+Based on the provided documents and the recent conversation context, answer the following question.
+Before responding, ensure the answer is directly supported by the documents or context.
+Do not make assumptions or infer beyond the given information.
+Only answer if you are more than 80% confident that the response is fully supported.
+If the answer cannot be determined, respond with: [NO_RAG_ANSWER]
+
 ### Relevant Documents
 Use the following documents to answer the question:
 {% for doc in docs %}
@@ -57,7 +61,4 @@ Avoid speculating or making assumptions beyond the given information and keep yo
 If you are unable to find an answer in the given relevant documents, do not cite sources from elsewhere in the conversation context.
 {% endif %}
 
-{% if check_relevancy %}
-If answer is not relevant output: "[NO_RELEVANT_ANSWER_FOUND]"
-{% endif %}
 Your answer:

rasa/core/policies/intentless_policy.py

@@ -38,6 +38,7 @@ from rasa.shared.constants import (
     MODEL_NAME_CONFIG_KEY,
     OPENAI_PROVIDER,
     PROMPT_CONFIG_KEY,
+    PROMPT_TEMPLATE_CONFIG_KEY,
     PROVIDER_CONFIG_KEY,
     TEMPERATURE_CONFIG_KEY,
     TIMEOUT_CONFIG_KEY,
@@ -56,7 +57,10 @@ from rasa.shared.providers.embedding._langchain_embedding_client_adapter import
     _LangchainEmbeddingClientAdapter,
 )
 from rasa.shared.providers.llm.llm_client import LLMClient
-from rasa.shared.utils.constants import LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON
+from rasa.shared.utils.constants import (
+    LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,
+    LOG_COMPONENT_SOURCE_METHOD_INIT,
+)
 from rasa.shared.utils.health_check.embeddings_health_check_mixin import (
     EmbeddingsHealthCheckMixin,
 )
@@ -68,6 +72,7 @@ from rasa.shared.utils.llm import (
     DEFAULT_OPENAI_EMBEDDING_MODEL_NAME,
     DEFAULT_OPENAI_MAX_GENERATED_TOKENS,
     USER,
+    check_prompt_config_keys_and_warn_if_deprecated,
     combine_custom_and_default_config,
     embedder_factory,
     get_prompt_template,
@@ -119,9 +124,12 @@ DEFAULT_EMBEDDINGS_CONFIG = {
     MODEL_CONFIG_KEY: DEFAULT_OPENAI_EMBEDDING_MODEL_NAME,
 }
 
-DEFAULT_INTENTLESS_PROMPT_TEMPLATE = importlib.resources.open_text(
+DEFAULT_INTENTLESS_PROMPT_TEMPLATE_FILE_NAME = importlib.resources.open_text(
     "rasa.core.policies", "intentless_prompt_template.jinja2"
 ).name
+DEFAULT_INTENTLESS_PROMPT_TEMPLATE = importlib.resources.read_text(
+    "rasa.core.policies", "intentless_prompt_template.jinja2"
+)
 
 INTENTLESS_PROMPT_TEMPLATE_FILE_NAME = "intentless_policy_prompt.jinja2"
 INTENTLESS_CONFIG_FILE_NAME = "config.json"
@@ -345,7 +353,7 @@ class IntentlessPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Policy):
             # ensures that the policy will not override a deterministic policy
             # which utilizes the nlu predictions confidence (e.g. Memoization).
             NLU_ABSTENTION_THRESHOLD: 0.9,
-            PROMPT_CONFIG_KEY: DEFAULT_INTENTLESS_PROMPT_TEMPLATE,
+            PROMPT_TEMPLATE_CONFIG_KEY: None,  # TODO: remove in Rasa 4.0.0
         }
 
     @staticmethod
@@ -402,11 +410,43 @@ class IntentlessPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Policy):
         self.response_index = responses_docsearch
         self.conversation_samples_index = samples_docsearch
         self.embedder = self._create_plain_embedder(config)
-        self.prompt_template = prompt_template or rasa.shared.utils.io.read_file(
-            self.config[PROMPT_CONFIG_KEY]
+
+        # Warn if the prompt config key is used to set the prompt template
+        check_prompt_config_keys_and_warn_if_deprecated(config, "intentless_policy")
+
+        self.prompt_template = prompt_template or self._resolve_prompt_template(
+            config, LOG_COMPONENT_SOURCE_METHOD_INIT
         )
         self.trace_prompt_tokens = self.config.get("trace_prompt_tokens", False)
 
+    @classmethod
+    def _resolve_prompt_template(
+        cls: Any,
+        config: dict,
+        log_source_method: str,
+    ) -> str:
+        """Resolves the prompt template from the config.
+
+        Args:
+            config: The config to resolve the prompt template from.
+            log_source_method: The method from which the prompt template is resolved.
+
+        Returns:
+            The resolved prompt template.
+        """
+        # Prefer prompt template over prompt config key.
+        prompt_template_file = (
+            config.get(PROMPT_TEMPLATE_CONFIG_KEY)
+            or config.get(PROMPT_CONFIG_KEY)
+            or DEFAULT_INTENTLESS_PROMPT_TEMPLATE_FILE_NAME
+        )
+        return get_prompt_template(
+            prompt_template_file,
+            DEFAULT_INTENTLESS_PROMPT_TEMPLATE,
+            log_source_component=IntentlessPolicy.__name__,
+            log_source_method=log_source_method,
+        )
+
     @classmethod
     def _create_plain_embedder(cls, config: Dict[Text, Any]) -> Embeddings:
         """Creates an embedder that uses the OpenAI API.
@@ -945,11 +985,8 @@ class IntentlessPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Policy):
     @classmethod
     def fingerprint_addon(cls, config: Dict[str, Any]) -> Optional[str]:
         """Add a fingerprint of intentless policy for the graph."""
-        prompt_template = get_prompt_template(
-            config.get(PROMPT_CONFIG_KEY),
-            DEFAULT_INTENTLESS_PROMPT_TEMPLATE,
-            log_source_component=IntentlessPolicy.__name__,
-            log_source_method=LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,
+        prompt_template = cls._resolve_prompt_template(
+            config, LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON
         )
 
         llm_config = resolve_model_client_config(

rasa/core/utils.py

@@ -318,16 +318,25 @@ def should_force_slot_filling(
         and the name of the slot if applicable.
     """
     from rasa.dialogue_understanding.processor.command_processor import (
+        find_updated_flows,
         get_current_collect_step,
     )
 
     if tracker is None:
-        structlogger.error(
-            "slot.force_slot_filling.error",
+        structlogger.debug(
+            "slot.force_slot_filling.no_found_tracker",
             event_info="Tracker is None. Cannot force slot filling.",
         )
         return False, None
 
+    updated_flows = find_updated_flows(tracker, flows)
+    if updated_flows:
+        structlogger.debug(
+            "slot.force_slot_filling.running_flows_were_updated",
+            updated_flow_ids=updated_flows,
+        )
+        return False, None
+
     stack = tracker.stack
     step = get_current_collect_step(stack, flows)
     if step is None or not step.force_slot_filling:

rasa/dialogue_understanding/coexistence/llm_based_router.py

@@ -15,19 +15,17 @@ from rasa.dialogue_understanding.coexistence.constants import (
 )
 from rasa.dialogue_understanding.commands import Command, SetSlotCommand
 from rasa.dialogue_understanding.commands.noop_command import NoopCommand
-from rasa.dialogue_understanding.generator.constants import (
-    LLM_CONFIG_KEY,
-)
+from rasa.dialogue_understanding.generator.constants import LLM_CONFIG_KEY
 from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.constants import (
-    LOGIT_BIAS_CONFIG_KEY,
     MAX_COMPLETION_TOKENS_CONFIG_KEY,
     MODEL_CONFIG_KEY,
     OPENAI_PROVIDER,
     PROMPT_CONFIG_KEY,
+    PROMPT_TEMPLATE_CONFIG_KEY,
     PROVIDER_CONFIG_KEY,
     ROUTE_TO_CALM_SLOT,
     TEMPERATURE_CONFIG_KEY,
@@ -46,6 +44,7 @@ from rasa.shared.utils.health_check.llm_health_check_mixin import LLMHealthCheck
 from rasa.shared.utils.io import deep_container_fingerprint
 from rasa.shared.utils.llm import (
     DEFAULT_OPENAI_CHAT_MODEL_NAME,
+    check_prompt_config_keys_and_warn_if_deprecated,
     get_prompt_template,
     llm_factory,
     resolve_model_client_config,
@@ -58,22 +57,12 @@ DEFAULT_COMMAND_PROMPT_TEMPLATE = importlib.resources.read_text(
 )
 LLM_BASED_ROUTER_CONFIG_FILE_NAME = "config.json"
 
-# Token ids for gpt 3.5 and gpt 4 corresponding to space + capitalized Letter
-A_TO_C_TOKEN_IDS_CHATGPT = [
-    362,  # " A"
-    426,  # " B"
-    356,  # " C"
-]
-
 DEFAULT_LLM_CONFIG = {
     PROVIDER_CONFIG_KEY: OPENAI_PROVIDER,
     MODEL_CONFIG_KEY: DEFAULT_OPENAI_CHAT_MODEL_NAME,
     TIMEOUT_CONFIG_KEY: 7,
     TEMPERATURE_CONFIG_KEY: 0.0,
     MAX_COMPLETION_TOKENS_CONFIG_KEY: 1,
-    LOGIT_BIAS_CONFIG_KEY: {
-        str(token_id): 100 for token_id in A_TO_C_TOKEN_IDS_CHATGPT
-    },
 }
 
 structlogger = structlog.get_logger()
@@ -90,7 +79,7 @@ class LLMBasedRouter(LLMHealthCheckMixin, GraphComponent):
     def get_default_config() -> Dict[str, Any]:
         """The component's default config (see parent class for full docstring)."""
         return {
-            PROMPT_CONFIG_KEY: None,
+            PROMPT_TEMPLATE_CONFIG_KEY: None,  # TODO: remove in Rasa 4.0.0
             CALM_ENTRY: {STICKY: None},
             NLU_ENTRY: {
                 NON_STICKY: "handles chitchat",
@@ -111,10 +100,13 @@ class LLMBasedRouter(LLMHealthCheckMixin, GraphComponent):
             self.config.get(LLM_CONFIG_KEY), LLMBasedRouter.__name__
         )
 
+        # Warn if the prompt config key is used to set the prompt template
+        check_prompt_config_keys_and_warn_if_deprecated(config, "llm_based_router")
+
         self.prompt_template = (
             prompt_template
             or get_prompt_template(
-                config.get(PROMPT_CONFIG_KEY),
+                config.get(PROMPT_TEMPLATE_CONFIG_KEY) or config.get(PROMPT_CONFIG_KEY),
                 DEFAULT_COMMAND_PROMPT_TEMPLATE,
                 log_source_component=LLMBasedRouter.__name__,
                 log_source_method=LOG_COMPONENT_SOURCE_METHOD_INIT,
@@ -171,7 +163,6 @@ class LLMBasedRouter(LLMHealthCheckMixin, GraphComponent):
         **kwargs: Any,
     ) -> "LLMBasedRouter":
         """Loads trained component (see parent class for full docstring)."""
-
         # Perform health check on the resolved LLM client config
         llm_config = resolve_model_client_config(config.get(LLM_CONFIG_KEY, {}))
         cls.perform_llm_health_check(
@@ -327,7 +318,7 @@ class LLMBasedRouter(LLMHealthCheckMixin, GraphComponent):
     def fingerprint_addon(cls, config: Dict[str, Any]) -> Optional[str]:
         """Add a fingerprint of llm based router for the graph."""
         prompt_template = get_prompt_template(
-            config.get(PROMPT_CONFIG_KEY),
+            config.get(PROMPT_TEMPLATE_CONFIG_KEY) or config.get(PROMPT_CONFIG_KEY),
             DEFAULT_COMMAND_PROMPT_TEMPLATE,
             log_source_component=LLMBasedRouter.__name__,
             log_source_method=LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,

rasa/dialogue_understanding/commands/__init__.py

@@ -16,6 +16,9 @@ from rasa.dialogue_understanding.commands.error_command import ErrorCommand
 from rasa.dialogue_understanding.commands.free_form_answer_command import (
     FreeFormAnswerCommand,
 )
+from rasa.dialogue_understanding.commands.handle_code_change_command import (
+    HandleCodeChangeCommand,
+)
 from rasa.dialogue_understanding.commands.human_handoff_command import (
     HumanHandoffCommand,
 )
@@ -49,6 +52,7 @@ __all__ = [
     "SetSlotCommand",
     "StartFlowCommand",
     "HumanHandoffCommand",
+    "HandleCodeChangeCommand",
     "CorrectSlotsCommand",
     "CorrectedSlot",
     "ErrorCommand",

rasa/dialogue_understanding/commands/cancel_flow_command.py

@@ -95,12 +95,14 @@ class CancelFlowCommand(Command):
         original_stack = original_tracker.stack
 
         applied_events: List[Event] = []
-        user_frame = top_user_flow_frame(original_stack)
+        user_frame = top_user_flow_frame(
+            original_stack, ignore_call_and_link_frames=False
+        )
         current_flow = user_frame.flow(all_flows) if user_frame else None
 
         if not current_flow:
             structlogger.debug(
-                "command_executor.skip_cancel_flow.no_active_flow", command=self
+                "cancel_command.skip_cancel_flow.no_active_flow", command=self
             )
             return []
 

rasa/dialogue_understanding/commands/clarify_command.py

@@ -65,14 +65,14 @@ class ClarifyCommand(Command):
         clean_options = [flow.id for flow in flows if flow is not None]
         if len(clean_options) != len(self.options):
             structlogger.debug(
-                "command_executor.altered_command.dropped_clarification_options",
+                "clarify_command.altered_command.dropped_clarification_options",
                 command=self,
                 original_options=self.options,
                 cleaned_options=clean_options,
             )
         if len(clean_options) == 0:
             structlogger.debug(
-                "command_executor.skip_command.empty_clarification", command=self
+                "clarify_command.skip_command.empty_clarification", command=self
             )
             return []
 

rasa/dialogue_understanding/commands/correct_slots_command.py

@@ -144,7 +144,8 @@ class CorrectSlotsCommand(Command):
                 }
             else:
                 structlogger.debug(
-                    "command_executor.skip_correction.slot_already_set", command=self
+                    "correct_slots_command.skip_correction.slot_already_set",
+                    command=self,
                 )
         return proposed_slots
 
@@ -236,7 +237,7 @@ class CorrectSlotsCommand(Command):
             # previously set, and we also don't want to reset the slots, do
             # not correct the slots.
             structlogger.debug(
-                "command_executor.skip_correction",
+                "correct_slots_command.skip_correction",
                 is_reset_only=is_reset_only,
             )
             return None
@@ -274,12 +275,10 @@ class CorrectSlotsCommand(Command):
             # we shouldn't end up here as a correction shouldn't be triggered
             # if we are not in any flow. but just in case we do, we
             # just skip the command.
-            structlogger.warning(
-                "command_executor.correct_slots.no_active_flow", command=self
-            )
+            structlogger.warning("correct_slots_command.no_active_flow")
             return []
 
-        structlogger.debug("command_executor.correct_slots", command=self)
+        structlogger.debug("correct_slots_command", command=self)
         proposed_slots = self.corrected_slots_dict(tracker)
 
         correction_frame = self.create_correction_frame(

rasa/dialogue_understanding/commands/error_command.py

@@ -58,7 +58,7 @@ class ErrorCommand(Command):
             The events to apply to the tracker.
         """
         stack = tracker.stack
-        structlogger.debug("command_executor.error", command=self)
+        structlogger.debug("error_command.error", command=self)
         stack.push(
             InternalErrorPatternFlowStackFrame(
                 error_type=self.error_type, info=self.info

rasa/dialogue_understanding/commands/human_handoff_command.py

@@ -57,9 +57,7 @@ class HumanHandoffCommand(Command):
         """
         stack = tracker.stack
         stack.push(HumanHandoffPatternFlowStackFrame())
-        structlogger.debug(
-            "command_executor.human_handoff.pushed_to_stack", command=self
-        )
+        structlogger.debug("human_handoff_command.pushed_to_stack", command=self)
         return tracker.create_stack_updated_events(stack)
 
     def __hash__(self) -> int:

rasa/dialogue_understanding/commands/set_slot_command.py

@@ -100,14 +100,14 @@ class SetSlotCommand(Command):
         slot = tracker.slots.get(self.name)
         if slot is None:
             structlogger.debug(
-                "command_executor.skip_command.slot_not_in_domain", command=self
+                "set_slot_command.skip_command.slot_not_in_domain", command=self
             )
             return []
 
         if slot.has_same_coerced_value(self.value):
             # value hasn't changed, skip this one
             structlogger.debug(
-                "command_executor.skip_command.slot_already_set", command=self
+                "set_slot_command.skip_command.slot_already_set", command=self
             )
             return []
 
@@ -150,11 +150,11 @@ class SetSlotCommand(Command):
             )
             if not use_slot_fill:
                 structlogger.debug(
-                    "command_executor.skip_command.slot_not_asked_for", command=self
+                    "set_slot_command.skip_command.slot_not_asked_for", command=self
                 )
                 return []
 
-        structlogger.debug("command_executor.set_slot", command=self)
+        structlogger.debug("set_slot_command.set_slot", command=self)
         return [
             SlotSet(self.name, slot.coerce_value(self.value), filled_by=self.extractor)
         ]

rasa/dialogue_understanding/commands/skip_question_command.py

@@ -63,9 +63,7 @@ class SkipQuestionCommand(Command):
         current_flow = user_frame.flow(all_flows) if user_frame else None
 
         if not current_flow:
-            structlogger.debug(
-                "command_executor.skip_question.no_active_flow", command=self
-            )
+            structlogger.debug("skip_question_command.no_active_flow", command=self)
             return []
 
         stack.push(SkipQuestionPatternFlowStackFrame())

rasa/dialogue_understanding/commands/start_flow_command.py

@@ -73,12 +73,12 @@ class StartFlowCommand(Command):
 
         if self.flow in user_flows_on_the_stack(stack):
             structlogger.debug(
-                "command_executor.skip_command.already_started_flow", command=self
+                "start_flow_command.skip_command.already_started_flow", command=self
             )
             return []
         elif self.flow not in all_flows.flow_ids:
             structlogger.debug(
-                "command_executor.skip_command.start_invalid_flow_id", command=self
+                "start_flow_command.skip_command.start_invalid_flow_id", command=self
             )
             return []
 
@@ -99,7 +99,7 @@ class StartFlowCommand(Command):
                     )
                 )
 
-        structlogger.debug("command_executor.start_flow", command=self)
+        structlogger.debug("start_flow_command.start_flow", command=self)
         stack.push(UserFlowStackFrame(flow_id=self.flow, frame_type=frame_type))
         return applied_events + tracker.create_stack_updated_events(stack)