Merge branch 'composite-entities' into pre-release-1.10.0a2

RasaHQ · Apr 22, 2020 · f5b08f0 · f5b08f0
2 parents c2e81fa + 33146f7
commit f5b08f0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: 'type:bug :bug:'
+labels: 'area:rasa-oss :ferris_wheel:,type:bug :bug:'
 assignees: ''
 
 ---

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea on how to improve Rasa
 title: ''
-labels: 'type:enhancement :sparkles:'
+labels: 'area:rasa-oss :ferris_wheel:,type:enhancement :sparkles:'
 assignees: ''
 
 ---

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,5 +1,4 @@
 import asyncio
-import os
 import random
 import uuid
 
@@ -41,7 +40,7 @@
     MOODBOT_MODEL_PATH,
     INCORRECT_NLU_DATA,
 )
-from tests.utilities import update_number_of_epochs
+
 
 DEFAULT_CONFIG_PATH = "rasa/cli/default_config.yml"
 

diff --git a/tests/nlu/training_data/test_markdown.py b/tests/nlu/training_data/test_markdown.py
@@ -134,7 +134,7 @@ def test_markdown_entity_regex(
 def test_deprecation_warning_logged():
     r = MarkdownReader()
 
-    md = f"""
+    md = """
 ## intent:test-intent
 - I want to go to [LA](city:Los Angeles)
     """

diff --git a/tests/nlu/training_data/test_training_data.py b/tests/nlu/training_data/test_training_data.py
@@ -96,24 +96,24 @@ def test_lookup_table_md():
 def test_composite_entities_data():
     td = training_data.load_data("data/test/demo-rasa-composite-entities.md")
     assert not td.is_empty()
-    assert len(td.entity_examples) == 16
-    assert len(td.intent_examples) == 51
-    assert len(td.training_examples) == 51
-    assert td.entity_synonyms == {"chines": "chinese"}
+    assert len(td.entity_examples) == 11
+    assert len(td.intent_examples) == 45
+    assert len(td.training_examples) == 45
+    assert td.entity_synonyms == {"SF": "San Fransisco"}
     assert td.intents == {
         "order_pizza",
-        "restaurant_search",
+        "book_flight",
         "chitchat",
         "greet",
         "goodbye",
         "affirm",
     }
-    assert td.entities == {"location", "cuisine", "topping", "size"}
+    assert td.entities == {"location", "topping", "size"}
     assert td.entity_groups == {"1", "2"}
-    assert td.entity_roles == {"european", "asian", "latin america"}
-    assert td.examples_per_entity["entity 'location'"] == 7
+    assert td.entity_roles == {"to", "from"}
+    assert td.examples_per_entity["entity 'location'"] == 8
     assert td.examples_per_entity["group '1'"] == 9
-    assert td.examples_per_entity["role 'european'"] == 1
+    assert td.examples_per_entity["role 'from'"] == 3
 
 
 @pytest.mark.parametrize(