rasa-pro 3.12.0.dev10__py3-none-any.whl → 3.12.0.dev12__py3-none-any.whl

rasa/shared/core/flows/utils.py

@@ -1,10 +1,9 @@
-from typing import Any, Dict, List, Set
+from typing import Set
 
 from rasa.shared.utils.io import raise_deprecation_warning
 
 RESET_PROPERTY_NAME = "reset_after_flow_ends"
 PERSIST_PROPERTY_NAME = "persisted_slots"
-ALL_LABEL = "ALL"
 
 
 def warn_deprecated_collect_step_config(flow_id: str, collect_step: str) -> None:
@@ -39,17 +38,3 @@ def get_invalid_slot_persistence_config_error_message(
         f"are neither used in a collect step nor a set_slot step of the flow. "
         f"Please remove such slots from the '{PERSIST_PROPERTY_NAME}' property."
     )
-
-
-def extract_digression_prop(prop: str, data: Dict[str, Any]) -> List[str]:
-    """Extracts the digression property from the data.
-
-    There can be two types of properties: ask_confirm_digressions and
-    block_digressions.
-    """
-    digression_property = data.get(prop, [])
-
-    if isinstance(digression_property, bool):
-        digression_property = [ALL_LABEL] if digression_property else []
-
-    return digression_property

rasa/shared/core/slot_mappings.py

@@ -6,8 +6,8 @@ from rasa.shared.constants import DOCS_URL_NLU_BASED_SLOTS, IGNORED_INTENTS
 from rasa.shared.core.constants import (
     ACTIVE_FLOW,
     ACTIVE_LOOP,
-    KEY_MAPPING_TYPE,
     MAPPING_CONDITIONS,
+    MAPPING_TYPE,
     REQUESTED_SLOT,
     SLOT_MAPPINGS,
     SlotMappingType,
@@ -59,11 +59,11 @@ class SlotMapping:
             )
 
         try:
-            mapping_type = SlotMappingType(mapping.get(KEY_MAPPING_TYPE))
+            mapping_type = SlotMappingType(mapping.get(MAPPING_TYPE))
         except ValueError:
             raise InvalidDomain(
                 f"Your domain uses an invalid slot mapping of type "
-                f"'{mapping.get(KEY_MAPPING_TYPE)}' for slot '{slot_name}'. Please see "
+                f"'{mapping.get(MAPPING_TYPE)}' for slot '{slot_name}'. Please see "
                 f"{DOCS_URL_NLU_BASED_SLOTS} for more information."
             )
 
@@ -299,7 +299,7 @@ class SlotFillingManager:
     def _verify_mapping_conditions(
         self, mapping: Dict[Text, Any], slot_name: Text
     ) -> bool:
-        if mapping.get(MAPPING_CONDITIONS) and mapping[KEY_MAPPING_TYPE] != str(
+        if mapping.get(MAPPING_CONDITIONS) and mapping[MAPPING_TYPE] != str(
             SlotMappingType.FROM_TRIGGER_INTENT
         ):
             if not self._matches_mapping_conditions(mapping, slot_name):
@@ -374,7 +374,7 @@ class SlotFillingManager:
     ) -> bool:
         from rasa.core.actions.forms import FormAction
 
-        if mapping[KEY_MAPPING_TYPE] != str(SlotMappingType.FROM_ENTITY):
+        if mapping[MAPPING_TYPE] != str(SlotMappingType.FROM_ENTITY):
             return False
 
         form_name = self.tracker.active_loop_name
@@ -495,7 +495,7 @@ def extract_slot_value(
 
     for mapping in slot.mappings:
         mapping_type = SlotMappingType(
-            mapping.get(KEY_MAPPING_TYPE, SlotMappingType.FROM_LLM.value)
+            mapping.get(MAPPING_TYPE, SlotMappingType.FROM_LLM.value)
         )
 
         if mapping_type in [SlotMappingType.FROM_LLM, SlotMappingType.CUSTOM]:

rasa/shared/core/slots.py

@@ -41,7 +41,6 @@ class Slot(ABC):
         influence_conversation: bool = True,
         is_builtin: bool = False,
         shared_for_coexistence: bool = False,
-        filled_by: Optional[str] = None,
     ) -> None:
         """Create a Slot.
 
@@ -58,7 +57,6 @@ class Slot(ABC):
                 such as `return_value`.
             shared_for_coexistence: If `True` the slot is not forgotten after either
                 dm1 or CALM finishes.
-            filled_by: The name of the extractor that fills the slot.
         """
         self.name = name
         self.mappings = mappings
@@ -69,7 +67,6 @@ class Slot(ABC):
         self._has_been_set = False
         self.is_builtin = is_builtin
         self.shared_for_coexistence = shared_for_coexistence
-        self._filled_by = filled_by
 
     def feature_dimensionality(self) -> int:
         """How many features this single slot creates.
@@ -135,16 +132,6 @@ class Slot(ABC):
         self._value = value
         self._has_been_set = True
 
-    @property
-    def filled_by(self) -> Optional[str]:
-        """Gets the slot's latest value extractor."""
-        return self._filled_by
-
-    @filled_by.setter
-    def filled_by(self, extractor: str) -> None:
-        """Sets the slot's latest value extractor."""
-        self._filled_by = extractor
-
     def has_same_coerced_value(self, other_value: Any) -> bool:
         """Checks if the coerced value of is the same as the slot value.
 
@@ -228,7 +215,6 @@ class FloatSlot(Slot):
         influence_conversation: bool = True,
         is_builtin: bool = False,
         shared_for_coexistence: bool = False,
-        filled_by: Optional[str] = None,
     ) -> None:
         """Creates a FloatSlot.
 
@@ -244,7 +230,6 @@ class FloatSlot(Slot):
             influence_conversation,
             is_builtin,
             shared_for_coexistence,
-            filled_by=filled_by,
         )
         self.max_value = max_value
         self.min_value = min_value
@@ -402,7 +387,6 @@ class CategoricalSlot(Slot):
         influence_conversation: bool = True,
         is_builtin: bool = False,
         shared_for_coexistence: bool = False,
-        filled_by: Optional[str] = None,
     ) -> None:
         """Creates a `Categorical  Slot` (see parent class for detailed docstring)."""
         super().__init__(
@@ -413,7 +397,6 @@ class CategoricalSlot(Slot):
             influence_conversation,
             is_builtin,
             shared_for_coexistence,
-            filled_by=filled_by,
         )
         if values and None in values:
             rasa.shared.utils.io.raise_warning(
@@ -624,7 +607,6 @@ class AnySlot(Slot):
         influence_conversation: bool = False,
         is_builtin: bool = False,
         shared_for_coexistence: bool = False,
-        filled_by: Optional[str] = None,
     ) -> None:
         """Creates an `Any  Slot` (see parent class for detailed docstring).
 
@@ -648,7 +630,6 @@ class AnySlot(Slot):
             influence_conversation,
             is_builtin,
             shared_for_coexistence,
-            filled_by=filled_by,
         )
 
     def __eq__(self, other: Any) -> bool:

rasa/shared/core/trackers.py

@@ -916,13 +916,11 @@ class DialogueStateTracker:
                 continue
             slot.reset()
 
-    def _set_slot(self, key: Text, value: Any, filled_by: Optional[str] = None) -> None:
+    def _set_slot(self, key: Text, value: Any) -> None:
         """Sets the value of a slot if that slot exists."""
         if key in self.slots:
             slot = self.slots[key]
             slot.value = value
-            if filled_by is not None:
-                slot.filled_by = filled_by
         else:
             logger.error(
                 f"Tried to set non existent slot '{key}'. Make sure you "

rasa/shared/nlu/constants.py

@@ -55,4 +55,3 @@ SPLIT_ENTITIES_BY_COMMA_DEFAULT_VALUE = True
 SINGLE_ENTITY_ALLOWED_INTERLEAVING_CHARSET = {".", ",", " ", ";"}
 
 SET_SLOT_COMMAND = "set slot"
-HANDLE_DIGRESSIONS_COMMAND = "handle digressions"

rasa/shared/utils/llm.py

@@ -680,7 +680,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__"])
+        return str([v for v in slot.values if v != "__other__"] + ["other"])
     else:
         return None
 

rasa/shared/utils/schemas/domain.yml

@@ -78,6 +78,7 @@ mapping:
           mappings:
            type: "seq"
            required: False
+           allowempty: False
            sequence:
               - type: "map"
                 allowempty: True

rasa/validator.py

@@ -36,9 +36,8 @@ from rasa.shared.core.command_payload_reader import (
 )
 from rasa.shared.core.constants import (
     ACTIVE_LOOP,
-    KEY_ALLOW_NLU_CORRECTION,
-    KEY_MAPPING_TYPE,
     MAPPING_CONDITIONS,
+    MAPPING_TYPE,
     SlotMappingType,
 )
 from rasa.shared.core.domain import (
@@ -46,14 +45,13 @@ from rasa.shared.core.domain import (
     Domain,
 )
 from rasa.shared.core.events import ActionExecuted, ActiveLoop, UserUttered
-from rasa.shared.core.flows import Flow, FlowsList
+from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.flows.flow_step_links import IfFlowStepLink
 from rasa.shared.core.flows.steps.action import ActionFlowStep
 from rasa.shared.core.flows.steps.collect import CollectInformationFlowStep
 from rasa.shared.core.flows.steps.link import LinkFlowStep
 from rasa.shared.core.flows.steps.set_slots import SetSlotsFlowStep
 from rasa.shared.core.flows.utils import (
-    ALL_LABEL,
     get_duplicate_slot_persistence_config_error_message,
     get_invalid_slot_persistence_config_error_message,
     warn_deprecated_collect_step_config,
@@ -522,7 +520,7 @@ class Validator:
             for mapping in slot.mappings:
                 for condition in mapping.get(MAPPING_CONDITIONS, []):
                     condition_active_loop = condition.get(ACTIVE_LOOP)
-                    mapping_type = SlotMappingType(mapping.get(KEY_MAPPING_TYPE))
+                    mapping_type = SlotMappingType(mapping.get(MAPPING_TYPE))
                     if (
                         condition_active_loop
                         and condition_active_loop not in self.domain.form_names
@@ -1266,7 +1264,6 @@ class Validator:
             self.verify_unique_flows(),
             self.verify_predicates(),
             self.verify_slot_persistence_configuration(),
-            self.verify_digression_configuration(),
         ]
 
         all_good = all(flow_validation_conditions)
@@ -1397,31 +1394,29 @@ class Validator:
             nlu_mappings = any(
                 [
                     SlotMappingType(
-                        mapping.get(KEY_MAPPING_TYPE, SlotMappingType.FROM_LLM.value)
+                        mapping.get("type", SlotMappingType.FROM_LLM.value)
                     ).is_predefined_type()
                     for mapping in slot.mappings
                 ]
             )
             llm_mappings = any(
                 [
-                    SlotMappingType(
-                        mapping.get(KEY_MAPPING_TYPE, SlotMappingType.FROM_LLM.value)
-                    )
+                    SlotMappingType(mapping.get("type", SlotMappingType.FROM_LLM.value))
                     == SlotMappingType.FROM_LLM
                     for mapping in slot.mappings
                 ]
             )
             custom_mappings = any(
                 [
-                    SlotMappingType(
-                        mapping.get(KEY_MAPPING_TYPE, SlotMappingType.FROM_LLM.value)
-                    )
+                    SlotMappingType(mapping.get("type", SlotMappingType.FROM_LLM.value))
                     == SlotMappingType.CUSTOM
                     for mapping in slot.mappings
                 ]
             )
 
-            all_good = self._allow_nlu_correction_is_valid(slot, nlu_mappings, all_good)
+            all_good = self._slot_contains_all_mappings_types(
+                llm_mappings, nlu_mappings, custom_mappings, slot.name, all_good
+            )
 
             all_good = self._custom_action_name_is_defined_in_the_domain(
                 custom_mappings, slot, all_good
@@ -1438,48 +1433,23 @@ class Validator:
         return all_good
 
     @staticmethod
-    def _allow_nlu_correction_is_valid(
-        slot: Slot, nlu_mappings: bool, all_good: bool
+    def _slot_contains_all_mappings_types(
+        llm_mappings: bool,
+        nlu_mappings: bool,
+        custom_mappings: bool,
+        slot_name: str,
+        all_good: bool,
     ) -> bool:
-        """Verify that `allow_nlu_correction` property is used correctly in a `from_llm` mappings only."""  # noqa: E501
-        if not slot.mappings:
-            return all_good
-
-        invalid_usage = False
-
-        for mapping in slot.mappings:
-            allow_nlu_correction = mapping.get(KEY_ALLOW_NLU_CORRECTION)
-            if (
-                allow_nlu_correction
-                and mapping.get(KEY_MAPPING_TYPE) != SlotMappingType.FROM_LLM.value
-            ):
-                invalid_usage = True
-
-            if allow_nlu_correction and not nlu_mappings:
-                structlogger.error(
-                    "validator.validate_slot_mappings_in_CALM.nlu_mappings_not_present",
-                    slot_name=slot.name,
-                    event_info=(
-                        f"The slot '{slot.name}' does not have any "
-                        f"NLU-based slot mappings. "
-                        f"The property `allow_nlu_correction` is only "
-                        f"applicable when the slot "
-                        f"contains both NLU-based and LLM-based slot mappings."
-                    ),
-                )
-                all_good = False
-
-        if invalid_usage:
+        if llm_mappings and (nlu_mappings or custom_mappings):
             structlogger.error(
-                "validator.validate_slot_mappings_in_CALM.allow_nlu_correction",
-                slot_name=slot.name,
+                "validator.validate_slot_mappings_in_CALM.llm_and_nlu_mappings",
+                slot_name=slot_name,
                 event_info=(
-                    f"The slot '{slot.name}' has at least 1 slot mapping with "
-                    f"'{KEY_ALLOW_NLU_CORRECTION}' set to 'true', but "
-                    f"the slot mapping type is not 'from_llm'. "
-                    f"Please set the slot mapping type to 'from_llm' "
-                    f"to allow the LLM to correct this slot."
+                    f"The slot '{slot_name}' has both LLM and "
+                    f"NLU or custom slot mappings. "
+                    f"Please make sure that the slot has only one type of mapping."
                 ),
+                docs_link=DOCS_URL_DOMAIN + "#calm-slot-mappings",
             )
             all_good = False
 
@@ -1688,123 +1658,3 @@ class Validator:
         )
 
         return all_good
-
-    def verify_digression_configuration(self) -> bool:
-        """Validates the digression configuration in flows."""
-        all_good = True
-
-        for flow in self.flows.underlying_flows:
-            all_good = self._validate_ask_confirm_digressions(flow, all_good)
-            all_good = self._validate_block_digressions(flow, all_good)
-
-        return all_good
-
-    def _validate_ask_confirm_digressions(self, flow: Flow, all_good: bool) -> bool:
-        """Validates the ask_confirm_digressions configuration in a flow."""
-        for flow_id in flow.ask_confirm_digressions:
-            if flow_id == ALL_LABEL:
-                continue
-            if flow_id not in self.flows.flow_ids:
-                structlogger.error(
-                    "validator.verify_digression_configuration.ask_confirm_digressions",
-                    flow=flow.id,
-                    event_info=(
-                        f"The flow '{flow_id}' is listed in the "
-                        f"`ask_confirm_digressions` configuration of flow "
-                        f"'{flow.id}', but it is not found in the "
-                        f"flows file. Please make sure that the flow id is correct."
-                    ),
-                )
-                all_good = False
-
-            if flow_id in flow.block_digressions:
-                structlogger.error(
-                    "validator.verify_digression_configuration.overlap_digressions",
-                    flow=flow.id,
-                    event_info=(
-                        f"The flow '{flow_id}' is listed in both the "
-                        f"`ask_confirm_digressions` and `block_digressions` "
-                        f"configuration of flow '{flow.id}'. "
-                        f"Please make sure that the flow id is not listed in both "
-                        f"configurations."
-                    ),
-                )
-                all_good = False
-
-        for step in flow.get_collect_steps():
-            for flow_id in step.ask_confirm_digressions:
-                if flow_id == ALL_LABEL:
-                    continue
-
-                if flow_id not in self.flows.flow_ids:
-                    structlogger.error(
-                        "validator.verify_digression_configuration.ask_confirm_digressions",
-                        flow=flow.id,
-                        step_id=step.id,
-                        event_info=(
-                            f"The flow '{flow_id}' is listed in the "
-                            f"`ask_confirm_digressions` configuration of step "
-                            f"'{step.id}' in flow '{flow.id}', but it is "
-                            f"not found in the flows file. "
-                            f"Please make sure that the flow id is correct."
-                        ),
-                    )
-                    all_good = False
-
-                if flow_id in step.block_digressions:
-                    structlogger.error(
-                        "validator.verify_digression_configuration.overlap_digressions",
-                        flow=flow.id,
-                        step_id=step.id,
-                        event_info=(
-                            f"The flow '{flow_id}' is listed in both the "
-                            f"`ask_confirm_digressions` and `block_digressions` "
-                            f"configuration of step '{step.id}' in flow '{flow.id}'. "
-                            f"Please make sure that the flow id is not listed in both "
-                            f"configurations."
-                        ),
-                    )
-                    all_good = False
-
-        return all_good
-
-    def _validate_block_digressions(self, flow: Flow, all_good: bool) -> bool:
-        """Validates the block_digressions configuration in a flow."""
-        for flow_id in flow.block_digressions:
-            if flow_id == ALL_LABEL:
-                continue
-
-            if flow_id not in self.flows.flow_ids:
-                structlogger.error(
-                    "validator.verify_digression_configuration.block_digressions",
-                    flow=flow.id,
-                    event_info=(
-                        f"The flow '{flow_id}' is listed in the `block_digressions` "
-                        f"configuration of flow '{flow.id}', but it is not found "
-                        f"in the flows file. Please make sure that the flow id "
-                        f"is correct."
-                    ),
-                )
-                all_good = False
-
-        for step in flow.get_collect_steps():
-            for flow_id in step.block_digressions:
-                if flow_id == ALL_LABEL:
-                    continue
-
-                if flow_id not in self.flows.flow_ids:
-                    structlogger.error(
-                        "validator.verify_digression_configuration.block_digressions",
-                        flow=flow.id,
-                        step_id=step.id,
-                        event_info=(
-                            f"The flow '{flow_id}' is listed in the "
-                            f"`block_digressions` configuration of step "
-                            f"'{step.id}' in flow '{flow.id}', but it is "
-                            f"not found in the flows file. "
-                            f"Please make sure that the flow id is correct."
-                        ),
-                    )
-                    all_good = False
-
-        return all_good

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.12.0.dev10"
+__version__ = "3.12.0.dev12"

{rasa_pro-3.12.0.dev10.dist-info → rasa_pro-3.12.0.dev12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.12.0.dev10
+Version: 3.12.0.dev12
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Home-page: https://rasa.com
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework