RasaHQ · indam23 · Mar 10, 2022 · Feb 17, 2022 · Feb 17, 2022 · Feb 22, 2022
diff --git a/changelog/10899.improvement.md b/changelog/10899.improvement.md
@@ -0,0 +1 @@
+Add an `influence_conversation` flag to entites to provide a shorthand for ignoring an entity for all intents.
diff --git a/data/examples/rasa/demo-rasa-multi-intent.yml b/data/examples/rasa/demo-rasa-multi-intent.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: affirm
   examples: |

diff --git a/data/examples/rasa/demo-rasa.yml b/data/examples/rasa/demo-rasa.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: affirm
   examples: |

diff --git a/data/test/demo-rasa-composite-entities.yml b/data/test/demo-rasa-composite-entities.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: affirm
   examples: |

diff --git a/data/test/demo-rasa-lookup-ents.yml b/data/test/demo-rasa-lookup-ents.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: affirm
   examples: |
@@ -24,4 +24,4 @@ nlu:
     - milk
     - bread
     - butter
-    - pasta
+    - pasta
diff --git a/data/test/demo-rasa-more-ents-and-multiplied.yml b/data/test/demo-rasa-more-ents-and-multiplied.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: affirm
   examples: |

diff --git a/data/test/demo-rasa-no-ents.yml b/data/test/demo-rasa-no-ents.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: affirm
   examples: |

diff --git a/data/test/duplicate_intents_yaml/demo-rasa-intents-1.yml b/data/test/duplicate_intents_yaml/demo-rasa-intents-1.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: affirm
   examples: |

diff --git a/data/test/duplicate_intents_yaml/demo-rasa-intents-2.yml b/data/test/duplicate_intents_yaml/demo-rasa-intents-2.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: affirm
   examples: |

diff --git a/data/test/duplicate_intents_yaml/demo-rasa-intents-3.yml b/data/test/duplicate_intents_yaml/demo-rasa-intents-3.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: affirm
   examples: |

diff --git a/data/test/incorrect_nlu_format.yml b/data/test/incorrect_nlu_format.yml
@@ -1,2 +1,2 @@
-version: "3.0"
+version: "3.1"
 nlu:
diff --git a/data/test/lookup_tables/lookup_table.yml b/data/test/lookup_tables/lookup_table.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: restaurant_search
   examples: |

diff --git a/data/test/many_intents.yml b/data/test/many_intents.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: handleinsult
   examples: |

diff --git a/data/test/overlapping_regex_entities.yml b/data/test/overlapping_regex_entities.yml
@@ -1,5 +1,5 @@
 
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: restaurant_search
   examples: |

diff --git a/data/test/simple_retrieval_intent_nlu.yml b/data/test/simple_retrieval_intent_nlu.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: chitchat/hello
   examples: |

diff --git a/data/test/stories_default_retrieval_intents.yml b/data/test/stories_default_retrieval_intents.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: greet
   examples: |

diff --git a/data/test/synonyms_only.yml b/data/test/synonyms_only.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - synonym: chinese
   examples: |

diff --git a/data/test_domains/conditional_response_variations.yml b/data/test_domains/conditional_response_variations.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - greet

diff --git a/data/test_domains/default_unfeaturized_entities.yml b/data/test_domains/default_unfeaturized_entities.yml
@@ -1,5 +1,5 @@
 intents:
- - greet: {use_entities: [name]}
+ - greet: {use_entities: [name, used_entity]}
  - default: {ignore_entities : [unrelated_recognized_entity]}
  - goodbye: {use_entities: null}
  - thank: {use_entities: False}
@@ -11,6 +11,10 @@ entities:
  - name
  - unrelated_recognized_entity
  - other
+ - used_entity:
+    influence_conversation: true
+ - unused_entity:
+    influence_conversation: false
 
 responses:
   utter_greet:

diff --git a/data/test_domains/test_domain_from_directory/domain_invalid.yml b/data/test_domains/test_domain_from_directory/domain_invalid.yml
@@ -1,4 +1,4 @@
 # invalid yml file should create warning
 # contains duplicate key
-version: "3.0"
-version: "3.0"
+version: "3.1"
+version: "3.1"
diff --git a/data/test_domains/test_domain_from_directory/domain_valid.yml b/data/test_domains/test_domain_from_directory/domain_valid.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 intents:
   - greet
   - default

diff --git a/data/test_domains/test_domain_from_directory_for_entities/game_1.yml b/data/test_domains/test_domain_from_directory_for_entities/game_1.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - play:

diff --git a/data/test_domains/test_domain_from_directory_for_entities/game_2.yml b/data/test_domains/test_domain_from_directory_for_entities/game_2.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - support_encouraging:

diff --git a/data/test_domains/test_domain_from_directory_for_entities/game_3.yml b/data/test_domains/test_domain_from_directory_for_entities/game_3.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - question
diff --git a/data/test_domains/test_domain_from_directory_tree/domain_pt1.yml b/data/test_domains/test_domain_from_directory_tree/domain_pt1.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - utter_root

diff --git a/data/test_domains/test_domain_from_directory_tree/skill_1_domain/domain_pt2.yml b/data/test_domains/test_domain_from_directory_tree/skill_1_domain/domain_pt2.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - utter_skill_1

diff --git a/data/test_domains/test_domain_from_directory_tree/skill_2_domain/domain_pt3.yml b/data/test_domains/test_domain_from_directory_tree/skill_2_domain/domain_pt3.yml
@@ -1,7 +1,7 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - utter_skill_2
 
 utter_did_that_help:
-  - text: "Did that help you?"
+  - text: "Did that help you?"
diff --git a/...main/skill_2_subdirectory/domain_pt4.yaml → ...omain/skill_2_subdirectory/domain_pt4.yml b/...main/skill_2_subdirectory/domain_pt4.yaml → ...omain/skill_2_subdirectory/domain_pt4.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - utter_subskill

diff --git a/data/test_domains/test_domain_from_multiple_files/drum.yml b/data/test_domains/test_domain_from_multiple_files/drum.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
 - drum_robot:

diff --git a/data/test_domains/test_domain_from_multiple_files/last_month.yml b/data/test_domains/test_domain_from_multiple_files/last_month.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 session_config:
   session_expiration_time: 360
   carry_over_slots_to_new_session: True

diff --git a/data/test_domains/test_domain_from_multiple_files/main_menu.yml b/data/test_domains/test_domain_from_multiple_files/main_menu.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
 - main_menu

diff --git a/data/test_domains/test_domain_from_multiple_files/selection.yml b/data/test_domains/test_domain_from_multiple_files/selection.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
 - finish_selection

diff --git a/data/test_domains/test_domain_from_multiple_files/small_talk.yml b/data/test_domains/test_domain_from_multiple_files/small_talk.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
 - bot_challenge

diff --git a/data/test_domains/test_domain_from_multiple_files/tomorrow.yml b/data/test_domains/test_domain_from_multiple_files/tomorrow.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
 - cure_network

diff --git a/data/test_domains/test_domain_from_multiple_files/wallets.yml b/data/test_domains/test_domain_from_multiple_files/wallets.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
 - open_wallet

diff --git a/data/test_domains/test_domain_with_duplicates/domain1.yml b/data/test_domains/test_domain_with_duplicates/domain1.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - greet

diff --git a/data/test_domains/test_domain_with_duplicates/domain2.yml b/data/test_domains/test_domain_with_duplicates/domain2.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - greet

diff --git a/data/test_domains/test_domain_without_duplicates/domain1.yml b/data/test_domains/test_domain_without_duplicates/domain1.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - goodbye

diff --git a/data/test_domains/test_domain_without_duplicates/domain2.yml b/data/test_domains/test_domain_without_duplicates/domain2.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - greet

diff --git a/data/test_e2ebot/data/nlu.yml b/data/test_e2ebot/data/nlu.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 nlu:
 - intent: tell_name

diff --git a/data/test_e2ebot/data/stories.yml b/data/test_e2ebot/data/stories.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 stories:
 - story: Tell name and mood

diff --git a/data/test_e2ebot/domain.yml b/data/test_e2ebot/domain.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
  - tell_name

diff --git a/data/test_e2ebot/tests/test_stories.yml b/data/test_e2ebot/tests/test_stories.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 stories:
 - story: Test with two easy entities

diff --git a/data/test_e2ebot/tests/test_stories_with_unknown_bot_utterances.yml b/data/test_e2ebot/tests/test_stories_with_unknown_bot_utterances.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 stories:
 - story: Test with two easy entities

diff --git a/data/test_evaluations/test_form_end_to_end_stories.yml b/data/test_evaluations/test_form_end_to_end_stories.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 stories:
   - story: stop form + continue
     steps:

diff --git a/data/test_incremental_training/iter1/nlg_training_data.yml b/data/test_incremental_training/iter1/nlg_training_data.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 responses:
   utter_mood/great:
   - text: some response to mood/great

diff --git a/data/test_incremental_training/iter1/training_data.yml b/data/test_incremental_training/iter1/training_data.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: bot_challenge
   examples: |

diff --git a/data/test_incremental_training/iter2/training_data.yml b/data/test_incremental_training/iter2/training_data.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: affirm
   examples: |

diff --git a/data/test_mixed_yaml_training_data/training_data.yml b/data/test_mixed_yaml_training_data/training_data.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: intent_name
   examples: |

diff --git a/data/test_moodbot/data/nlu.yml b/data/test_moodbot/data/nlu.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: greet
   examples: |

diff --git a/data/test_moodbot/data/rules.yml b/data/test_moodbot/data/rules.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 rules:
 - rule: Say goodbye anytime the user says goodbye
   steps:

diff --git a/data/test_moodbot/data/stories.yml b/data/test_moodbot/data/stories.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 stories:
 - story: happy path
   steps:

diff --git a/data/test_moodbot/domain.yml b/data/test_moodbot/domain.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - greet

diff --git a/data/test_multi_domain/data/GreetBot/data/nlu.yml b/data/test_multi_domain/data/GreetBot/data/nlu.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: greet
   examples: |

diff --git a/data/test_multi_domain/data/GreetBot/data/stories.yml b/data/test_multi_domain/data/GreetBot/data/stories.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 stories:
 - story: say hello
   steps:

diff --git a/data/test_multi_domain/data/MoodBot/data/nlu.yml b/data/test_multi_domain/data/MoodBot/data/nlu.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: affirm
   examples: |

diff --git a/data/test_multi_domain/data/MoodBot/data/stories.yml b/data/test_multi_domain/data/MoodBot/data/stories.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 stories:
 - story: happy path
   steps:

diff --git a/data/test_multi_domain/data/nlu.yml b/data/test_multi_domain/data/nlu.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: goodbye
   examples: |

diff --git a/data/test_multi_domain/data/stories.yml b/data/test_multi_domain/data/stories.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 stories:
 - story: say goodbye
   steps:

diff --git a/data/test_multiline_intent_examples_yaml/nlu.yml b/data/test_multiline_intent_examples_yaml/nlu.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: greet
   examples:

diff --git a/data/test_multiproject/projects/ChitchatBot/data/nlu.yml b/data/test_multiproject/projects/ChitchatBot/data/nlu.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 nlu:
 - intent: bot_challenge
   examples: |

diff --git a/data/test_multiproject/projects/ChitchatBot/data/rules.yml b/data/test_multiproject/projects/ChitchatBot/data/rules.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 rules:
 - rule: Tell a joke when the user asks for one
   steps:

diff --git a/data/test_multiproject/projects/ChitchatBot/domain.yml b/data/test_multiproject/projects/ChitchatBot/domain.yml
@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.1"
 
 intents:
   - tell_joke