Merge pull request #12268 from RasaHQ/ATO-919-define-intent-as-list-i…

…n-from-intent-sm-3.5.x

Allow intents as list in from_intent in slot mapping

changelog/12268.bugfix.md

@@ -0,0 +1 @@
+Allow slot mapping parameter `intent` to accept a list of intent names (as strings), in addition to accepting an intent name as a single string.

rasa/shared/core/slot_mappings.py

@@ -205,14 +205,16 @@ def check_mapping_validity(
         if (
             mapping_type == SlotMappingType.FROM_INTENT
             and mapping.get(INTENT) is not None
-            and mapping.get(INTENT) not in domain.intents
         ):
-            rasa.shared.utils.io.raise_warning(
-                f"Slot '{slot_name}' uses a 'from_intent' mapping for "
-                f"a non-existent intent '{mapping.get('intent')}'. "
-                f"Skipping slot extraction because of invalid mapping."
-            )
-            return False
+            intent_list = SlotMapping.to_list(mapping.get(INTENT))
+            for intent in intent_list:
+                if intent and intent not in domain.intents:
+                    rasa.shared.utils.io.raise_warning(
+                        f"Slot '{slot_name}' uses a 'from_intent' mapping for "
+                        f"a non-existent intent '{mapping.get('intent')}'. "
+                        f"Skipping slot extraction because of invalid mapping."
+                    )
+                    return False
 
         return True
 

tests/shared/core/test_slot_mappings.py

@@ -167,3 +167,87 @@ def test_slot_mappings_check_mapping_validity_from_intent():
         mapping=mappings_for_slot[0],
         domain=domain,
     )
+
+
+@pytest.mark.parametrize(
+    "intent, expected",
+    [
+        (["goodbye", "mood_great", "greet"], True),
+        ([], True),
+        ("", True),
+        ({}, True),
+        ("null", True),
+    ],
+)
+def test_slot_mappings_check_mapping_validity_valid_intent_list(
+    intent: Text, expected: bool
+):
+    slot_name = "mood"
+    domain = Domain.from_yaml(
+        f"""
+        version: "{LATEST_TRAINING_DATA_FORMAT_VERSION}"
+        intents:
+        - greet
+        - goodbye
+        - mood_great
+        - mood_unhappy
+        slots:
+          {slot_name}:
+            type: any
+            influence_conversation: false
+            mappings:
+            - type: from_intent
+              value: "testing 123"
+              intent: {intent}
+        forms:
+            test_form:
+                required_slots:
+                - test_slot
+        """
+    )
+    mappings_for_slot = domain.as_dict().get("slots").get(slot_name).get("mappings")
+    assert (
+        SlotMapping.check_mapping_validity(
+            slot_name=slot_name,
+            mapping_type=SlotMappingType.FROM_INTENT,
+            mapping=mappings_for_slot[0],
+            domain=domain,
+        )
+        is expected
+    )
+
+
+def test_slot_mappings_check_mapping_validity_invalid_intent_list():
+    slot_name = "mood"
+    domain = Domain.from_yaml(
+        f"""
+        version: "{LATEST_TRAINING_DATA_FORMAT_VERSION}"
+        intents:
+        - greet
+        - goodbye
+        - mood_great
+        - mood_unhappy
+        slots:
+          {slot_name}:
+            type: any
+            influence_conversation: false
+            mappings:
+            - type: from_intent
+              value: "testing 123"
+              intent:
+                - aaaa
+                - bbbb
+                - cccc
+        forms:
+            test_form:
+                required_slots:
+                - test_slot
+        """
+    )
+    mappings_for_slot = domain.as_dict().get("slots").get(slot_name).get("mappings")
+    assert not SlotMapping.check_mapping_validity(
+        slot_name=slot_name,
+        mapping_type=SlotMappingType.FROM_INTENT,
+        mapping=mappings_for_slot[0],
+        domain=domain,
+    )