rasa-pro 3.13.0.dev2__py3-none-any.whl → 3.13.0.dev5__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/du_test_case.py

@@ -261,19 +261,27 @@ class DialogueUnderstandingTestStep(BaseModel):
         # Safely extract commands from the step.
         commands = []
         for command in step.get(KEY_COMMANDS, []):
+            parsed_commands = None
             try:
-                commands.extend(
-                    parse_commands(
-                        command,
-                        flows,
-                        clarify_options_optional=True,
-                        additional_commands=custom_command_classes,
-                        default_commands_to_remove=remove_default_commands,
-                    )
+                parsed_commands = parse_commands(
+                    command,
+                    flows,
+                    clarify_options_optional=True,
+                    additional_commands=custom_command_classes,
+                    default_commands_to_remove=remove_default_commands,
                 )
             except (IndexError, ValueError) as e:
                 raise ValueError(f"Failed to parse command '{command}': {e}") from e
 
+            if not parsed_commands:
+                raise ValueError(
+                    f"Failed to parse command '{command}': command parser returned "
+                    f"None. Please make sure that you are using the correct command "
+                    f"syntax and the command arguments are valid."
+                )
+
+            commands.extend(parsed_commands)
+
         # Construct the DialogueUnderstandingTestStep
         return DialogueUnderstandingTestStep(
             actor=ACTOR_USER if ACTOR_USER in step else ACTOR_BOT,

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/plugin.py

@@ -32,11 +32,8 @@ def plugin_manager() -> pluggy.PluginManager:
 
 def init_hooks(manager: pluggy.PluginManager) -> None:
     """Initialise hooks into rasa."""
-    import rasa.utils.licensing
     from rasa import hooks
 
-    rasa.utils.licensing.validate_license_from_env()
-
     manager.register(hooks)
 
 

rasa/shared/constants.py

@@ -238,6 +238,7 @@ EXTRA_PARAMETERS_KEY = "extra_parameters"
 MODEL_GROUP_ID_KEY = "model_group_id"
 MODEL_LIST_KEY = "model_list"
 LITELLM_PARAMS_KEY = "litellm_params"
+_VALIDATE_ENVIRONMENT_MISSING_KEYS_KEY = "missing_keys"
 
 LLM_API_HEALTH_CHECK_ENV_VAR = "LLM_API_HEALTH_CHECK"
 LLM_API_HEALTH_CHECK_DEFAULT_VALUE = "false"

rasa/shared/core/domain.py

@@ -134,6 +134,22 @@ ALL_DOMAIN_KEYS = [
 
 PREV_PREFIX = "prev_"
 
+MERGE_FUNC_MAPPING: Dict[Text, Callable[..., Any]] = {
+    KEY_ACTIONS: rasa.shared.utils.common.merge_lists_of_dicts,
+    KEY_RESPONSES: rasa.shared.utils.common.merge_dicts,
+    KEY_SLOTS: rasa.shared.utils.common.merge_dicts,
+    KEY_INTENTS: rasa.shared.utils.common.merge_lists_of_dicts,
+    KEY_ENTITIES: rasa.shared.utils.common.merge_lists_of_dicts,
+    KEY_E2E_ACTIONS: rasa.shared.utils.common.merge_lists,
+    KEY_FORMS: rasa.shared.utils.common.merge_dicts,
+}
+
+DICT_DATA_KEYS = [
+    key
+    for key, value in MERGE_FUNC_MAPPING.items()
+    if value == rasa.shared.utils.common.merge_dicts
+]
+
 # State is a dictionary with keys (USER, PREVIOUS_ACTION, SLOTS, ACTIVE_LOOP)
 # representing the origin of a SubState;
 # the values are SubStates, that contain the information needed for featurization
@@ -466,17 +482,7 @@ class Domain:
 
         duplicates: Dict[Text, List[Text]] = {}
 
-        merge_func_mappings: Dict[Text, Callable[..., Any]] = {
-            KEY_INTENTS: rasa.shared.utils.common.merge_lists_of_dicts,
-            KEY_ENTITIES: rasa.shared.utils.common.merge_lists_of_dicts,
-            KEY_ACTIONS: rasa.shared.utils.common.merge_lists_of_dicts,
-            KEY_E2E_ACTIONS: rasa.shared.utils.common.merge_lists,
-            KEY_FORMS: rasa.shared.utils.common.merge_dicts,
-            KEY_RESPONSES: rasa.shared.utils.common.merge_dicts,
-            KEY_SLOTS: rasa.shared.utils.common.merge_dicts,
-        }
-
-        for key, merge_func in merge_func_mappings.items():
+        for key, merge_func in MERGE_FUNC_MAPPING.items():
             duplicates[key] = rasa.shared.utils.common.extract_duplicates(
                 combined.get(key, []), domain_dict.get(key, [])
             )
@@ -494,6 +500,74 @@ class Domain:
 
         return combined
 
+    def partial_merge(self, other: Domain) -> Domain:
+        """
+        Returns a new Domain with intersection-based merging:
+          - For each domain section only overwrite items that already exist in self.
+          - Brand-new items in `other` are ignored.
+
+        Args:
+            other: The domain to merge with.
+
+        Returns:
+            A new Domain object with the merged content.
+        """
+        updated_self = copy.deepcopy(self.as_dict())
+        other_dict = other.as_dict()
+
+        keys_to_merge = MERGE_FUNC_MAPPING.keys()
+        for key in keys_to_merge:
+            if key in DICT_DATA_KEYS:
+                # Merge dictionaries
+                self_val = updated_self.get(key, {})
+                other_val = other_dict.get(key, {})
+                updated_self[key] = rasa.shared.utils.common.partial_merge_dict(
+                    self_val, other_val
+                )
+            else:
+                # Merge lists
+                self_val = updated_self.get(key, [])
+                other_val = other_dict.get(key, [])
+                is_same_item_fn = SAME_ITEM_FUNCTIONS.get(key, default_is_same_item)
+                updated_self[key] = rasa.shared.utils.common.partial_merge_list(
+                    self_val, other_val, is_same_item_fn
+                )
+
+        return Domain.from_dict(updated_self)
+
+    def difference(self, other: Domain) -> Domain:
+        """
+        Returns a new Domain containing items in `self` that are NOT in `other`,
+        using simple equality checks for dict/list items.
+
+        Args:
+            other: The domain to compare with.
+
+        Returns:
+            A new Domain object with the difference content.
+        """
+        self_dict = self.as_dict()
+        other_dict = other.as_dict()
+
+        difference_dict = {}
+        for key in MERGE_FUNC_MAPPING.keys():
+            is_dict = key in DICT_DATA_KEYS
+            self_val = self_dict.get(key, {} if is_dict else [])
+            other_val = other_dict.get(key, {} if is_dict else [])
+
+            if is_dict and isinstance(self_val, dict) and isinstance(other_val, dict):
+                difference_dict[key] = {
+                    k: v
+                    for k, v in self_val.items()
+                    if k not in other_val or v != other_val[k]
+                }
+            else:
+                difference_dict[key] = [
+                    item for item in self_val if item not in other_val
+                ]  # type: ignore[assignment]
+
+        return Domain.from_dict(difference_dict)
+
     def _preprocess_domain_dict(
         self,
         data: Dict,
@@ -2120,6 +2194,11 @@ class Domain:
         """Remove all builtin slots from the domain."""
         self.slots = [slot for slot in self.slots if not slot.is_builtin]
 
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, Domain):
+            return self.as_dict() == other.as_dict()
+        return False
+
 
 def warn_about_duplicates_found_during_domain_merging(
     duplicates: Dict[Text, List[Text]],
@@ -2178,3 +2257,78 @@ def _validate_forms(forms: Union[Dict, List]) -> None:
                 f"the keyword `{REQUIRED_SLOTS_KEY}` is required. "
                 f"Please see {DOCS_URL_FORMS} for more information."
             )
+
+
+def is_same_entity(e1: Any, e2: Any) -> bool:
+    """Check if two entities are the 'same' (string or dict).
+
+    Args:
+        e1: First entity to compare.
+        e2: Second entity to compare.
+
+    Returns:
+        True if the entities are the same, False otherwise.
+    """
+    if isinstance(e1, str) and isinstance(e2, str):
+        return e1 == e2
+
+    if isinstance(e1, dict) and isinstance(e2, dict):
+        return (
+            e1.get(ENTITY_ATTRIBUTE_TYPE) == e2.get(ENTITY_ATTRIBUTE_TYPE)
+            and e1.get(ENTITY_ATTRIBUTE_ROLE) == e2.get(ENTITY_ATTRIBUTE_ROLE)
+            and e1.get(ENTITY_ATTRIBUTE_GROUP) == e2.get(ENTITY_ATTRIBUTE_GROUP)
+        )
+
+    return False
+
+
+def is_same_intent(i1: Any, i2: Any) -> bool:
+    """Check if two intents are the 'same' (string or dict).
+
+    Args:
+        i1: First intent to compare.
+        i2: Second intent to compare.
+
+    Returns:
+        True if the intents are the same, False otherwise.
+    """
+    if isinstance(i1, str) and isinstance(i2, str):
+        return i1 == i2
+
+    if isinstance(i1, dict) and isinstance(i2, dict):
+        key1, key2 = next(iter(i1.keys())), next(iter((i2.keys())))
+        return key1 == key2
+
+    return False
+
+
+def is_same_action(a1: Any, a2: Any) -> bool:
+    """Check if two actions are the 'same' (string or dict).
+
+    Args:
+        a1: First action to compare.
+        a2: Second action to compare.
+
+    Returns:
+        True if the actions are the same, False otherwise.
+    """
+    if isinstance(a1, str) and isinstance(a2, str):
+        return a1 == a2
+
+    if isinstance(a1, dict) and isinstance(a2, dict):
+        key1, key2 = next(iter((a1.keys()))), next(iter((a2.keys())))
+        return key1 == key2
+
+    return False
+
+
+def default_is_same_item(a: Any, b: Any) -> bool:
+    """Fallback exact equality check if a key doesn't need special handling."""
+    return a == b
+
+
+SAME_ITEM_FUNCTIONS: Dict[Text, Callable[[Any, Any], bool]] = {
+    KEY_ENTITIES: is_same_entity,
+    KEY_INTENTS: is_same_intent,
+    KEY_ACTIONS: is_same_action,
+}