Merge 1cc2b2c into 66e12d8

CHANGELOG.rst

@@ -43,9 +43,12 @@ Removed
 
 Fixed
 -----
+- do_extractors_support_overlap now correctly throws an exception only if no extractors are passed or if extractors that do not
+support overlapping entities are used.
 
 [0.14.3] - 2019-02-01
 ^^^^^^^^^^^^^^^^^^^^^
+-
 
 Changed
 -------

rasa_nlu/test.py

@@ -529,7 +529,9 @@ def determine_token_labels(token, entities, extractors):
 def do_extractors_support_overlap(extractors):
     """Checks if extractors support overlapping entities
     """
-    return extractors is None or CRFEntityExtractor.name not in extractors
+    if extractors is None:
+        return False
+    return CRFEntityExtractor.name not in extractors
 
 
 def align_entity_predictions(targets, predictions, tokens, extractors):

tests/base/test_evaluation.py

@@ -4,6 +4,8 @@
 
 import pytest
 
+from rasa_nlu.extractors.mitie_entity_extractor import MitieEntityExtractor
+from rasa_nlu.extractors.spacy_entity_extractor import SpacyEntityExtractor
 from rasa_nlu.test import (
     is_token_within_entity, do_entities_overlap,
     merge_labels, remove_duckling_entities,
@@ -175,19 +177,27 @@ def test_entity_overlap():
 
 def test_determine_token_labels_throws_error():
     with pytest.raises(ValueError):
-        determine_token_labels(CH_correct_segmentation,
+        determine_token_labels(CH_correct_segmentation[0],
                                [CH_correct_entity,
                                 CH_wrong_entity], ["CRFEntityExtractor"])
 
 
 def test_determine_token_labels_no_extractors():
+    with pytest.raises(ValueError):
+        determine_token_labels(CH_correct_segmentation[0],
+                               [CH_correct_entity, CH_wrong_entity], None)
+
+
+def test_determine_token_labels_no_extractors_no_overlap():
     determine_token_labels(CH_correct_segmentation[0],
-                           [CH_correct_entity, CH_wrong_entity], None)
+                           EN_targets, None)
 
 
 def test_determine_token_labels_with_extractors():
     determine_token_labels(CH_correct_segmentation[0],
-                           [CH_correct_entity, CH_wrong_entity], ["A", "B"])
+                           [CH_correct_entity, CH_wrong_entity],
+                           [SpacyEntityExtractor.name,
+                            MitieEntityExtractor.name])
 
 
 def test_label_merging():