rasa-pro 3.13.0.dev8__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/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/dialogue_understanding/coexistence/llm_based_router.py

@@ -15,9 +15,7 @@ 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
@@ -28,6 +26,7 @@ from rasa.shared.constants import (
     MODEL_CONFIG_KEY,
     OPENAI_PROVIDER,
     PROMPT_CONFIG_KEY,
+    PROMPT_TEMPLATE_CONFIG_KEY,
     PROVIDER_CONFIG_KEY,
     ROUTE_TO_CALM_SLOT,
     TEMPERATURE_CONFIG_KEY,
@@ -46,6 +45,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,
@@ -90,7 +90,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 +111,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,
@@ -327,7 +330,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/cancel_flow_command.py

@@ -95,7 +95,9 @@ 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:

rasa/dialogue_understanding/commands/correct_slots_command.py

@@ -274,9 +274,7 @@ 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("command_executor.correct_slots.no_active_flow")
             return []
 
         structlogger.debug("command_executor.correct_slots", command=self)

rasa/dialogue_understanding/generator/nlu_command_adapter.py

@@ -190,9 +190,9 @@ class NLUCommandAdapter(GraphComponent, CommandGenerator):
         if len(commands) > 1:
             structlogger.warning(
                 "nlu_command_adapter.predict_commands",
-                messag=f"Two many flows found that are triggered by the "
+                message=f"Too many flows found that are triggered by the "
                 f"intent '{message.get(INTENT)['name']}'. Take the first one.",
-                commands=commands,
+                commands=[command.__class__.__name__ for command in commands],
             )
             commands = [commands[0]]
 

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/dialogue_understanding/generator/single_step/single_step_based_llm_command_generator.py

@@ -113,7 +113,7 @@ class SingleStepBasedLLMCommandGenerator(LLMBasedCommandGenerator, ABC):
     def get_default_config() -> Dict[str, Any]:
         """The component's default config (see parent class for full docstring)."""
         return {
-            PROMPT_TEMPLATE_CONFIG_KEY: None,
+            PROMPT_TEMPLATE_CONFIG_KEY: None,  # TODO: remove in Rasa 4.0.0
             USER_INPUT_CONFIG_KEY: None,
             LLM_CONFIG_KEY: None,
             FLOW_RETRIEVAL_KEY: FlowRetrieval.get_default_config(),
@@ -212,7 +212,7 @@ class SingleStepBasedLLMCommandGenerator(LLMBasedCommandGenerator, ABC):
                 event_info=(
                     "ProviderClientAPIException occurred while predicting commands."
                 ),
-                commands=commands,
+                commands=commands,  # no PII
             )
 
         if not commands and not prior_commands:

rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py

@@ -16,7 +16,10 @@ from rasa.shared.constants import (
     PROMPT_CONFIG_KEY,
     PROMPT_TEMPLATE_CONFIG_KEY,
 )
-from rasa.shared.utils.llm import get_prompt_template
+from rasa.shared.utils.llm import (
+    check_prompt_config_keys_and_warn_if_deprecated,
+    get_prompt_template,
+)
 
 DEFAULT_COMMAND_PROMPT_TEMPLATE = importlib.resources.read_text(
     "rasa.dialogue_understanding.generator.prompt_templates",
@@ -52,16 +55,10 @@ class SingleStepLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
             **kwargs,
         )
 
-        # Set the prompt template
-        if config.get(PROMPT_CONFIG_KEY):
-            structlogger.warning(
-                "single_step_llm_command_generator.init",
-                event_info=(
-                    "The config parameter 'prompt' is deprecated "
-                    "and will be removed in Rasa 4.0.0. "
-                    "Please use the config parameter 'prompt_template' instead. "
-                ),
-            )
+        # Warn if the prompt config key is used to set the prompt template
+        check_prompt_config_keys_and_warn_if_deprecated(
+            config, "single_step_llm_command_generator"
+        )
 
     @staticmethod
     def get_component_command_syntax_version() -> CommandSyntaxVersion:

rasa/dialogue_understanding/patterns/cancel.py

@@ -90,7 +90,7 @@ class ActionCancelFlow(action.Action):
             return []
 
         if not isinstance(top, CancelPatternFlowStackFrame):
-            structlogger.warning("action.cancel_flow.no_cancel_frame", top=top)
+            structlogger.warning("action.cancel_flow.no_cancel_frame")
             return []
 
         for canceled_frame_id in top.canceled_frames:
@@ -105,7 +105,6 @@ class ActionCancelFlow(action.Action):
             else:
                 structlogger.warning(
                     "action.cancel_flow.frame_not_found",
-                    dialogue_stack=stack,
                     frame_id=canceled_frame_id,
                 )
 

rasa/dialogue_understanding/patterns/clarify.py

@@ -89,7 +89,7 @@ class ActionClarifyFlows(action.Action):
             return []
 
         if not isinstance(top, ClarifyPatternFlowStackFrame):
-            structlogger.warning("action.clarify_flows.no_clarification_frame", top=top)
+            structlogger.warning("action.clarify_flows.no_clarification_frame")
             return []
 
         options_string = self.assemble_options_string(top.names)

rasa/dialogue_understanding/patterns/correction.py

@@ -114,7 +114,8 @@ class ActionCorrectFlowSlot(action.Action):
 
         if not isinstance(top, CorrectionPatternFlowStackFrame):
             structlogger.warning(
-                "action.correct_flow_slot.no_correction_frame", top=top
+                "action.correct_flow_slot.no_correction_frame",
+                top=top,  # no PII
             )
             return []
 
@@ -246,7 +247,6 @@ def reset_stack_on_tracker_to_prior_state(
             "action.correct_flow_slot.no_target_frame_found",
             reset_step_id=reset_step_id,
             reset_flow_id=reset_flow_id,
-            stack_to_reset_to=stack_to_reset_to,
         )
         return tracker.stack
 

rasa/dialogue_understanding/processor/command_processor.py

@@ -348,7 +348,6 @@ def get_current_collect_step(
         # but no flow that triggered it. this should never happen.
         structlogger.warning(
             "command_processor.get_current_collect_step.no_flow_on_stack",
-            stack=dialogue_stack,
         )
         return None
 
@@ -358,7 +357,7 @@ def get_current_collect_step(
         # step from it
         structlogger.warning(
             "command_processor.get_current_collect_step.no_step_for_frame",
-            frame=frame_that_triggered_collect_infos,
+            frame=frame_that_triggered_collect_infos.frame_id,
         )
         return None
 
@@ -724,7 +723,7 @@ def clean_up_chitchat_command(
         )
         structlogger.warn(
             "command_processor.clean_up_chitchat_command.pattern_chitchat_not_found",
-            command=resulting_commands[0],
+            command=resulting_commands[0],  # no PII
         )
         return resulting_commands
 
@@ -742,7 +741,7 @@ def clean_up_chitchat_command(
         )
         structlogger.warn(
             "command_processor.clean_up_chitchat_command.replace_chitchat_answer_with_cannot_handle",
-            command=resulting_commands[0],
+            command=resulting_commands[0],  # no PII
             pattern_chitchat_uses_action_trigger_chitchat=has_action_trigger_chitchat,
             defined_intentless_policy_in_config=defines_intentless_policy,
         )