Skip to content

Commit

Permalink
Merge 8e16ad1 into 22af37f
Browse files Browse the repository at this point in the history
  • Loading branch information
wochinge committed Jan 29, 2019
2 parents 22af37f + 8e16ad1 commit f2bb7eb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Expand Up @@ -12,6 +12,7 @@ Added

Changed
-------
- skip test data validation for evaluation
- applied spacy guidelines on how to disable pipeline components

Removed
Expand Down
3 changes: 2 additions & 1 deletion rasa_nlu/evaluate.py
Expand Up @@ -714,7 +714,8 @@ def run_evaluation(data_path, model,
else:
interpreter = Interpreter.load(model, component_builder)
test_data = training_data.load_data(data_path,
interpreter.model_metadata.language)
interpreter.model_metadata.language,
validate=False)
extractors = get_entity_extractors(interpreter)
entity_predictions, tokens = get_entity_predictions(interpreter,
test_data)
Expand Down
12 changes: 8 additions & 4 deletions rasa_nlu/training_data/loading.py
Expand Up @@ -13,6 +13,7 @@

if typing.TYPE_CHECKING:
from rasa_nlu.training_data import TrainingData
from rasa_nlu.training_data.formats.readerwriter import TrainingDataReader

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -40,7 +41,8 @@


def load_data(resource_name: Text,
language: Optional[Text] = 'en') -> 'TrainingData':
language: Optional[Text] = 'en',
validate: bool = True) -> 'TrainingData':
"""Load training data from disk.
Merges them if loaded from disk and multiple files are found."""
Expand All @@ -56,7 +58,8 @@ def load_data(resource_name: Text,
else:
training_data = data_sets[0].merge(*data_sets[1:])

training_data.validate()
if validate:
training_data.validate()
return training_data


Expand All @@ -80,7 +83,7 @@ def load_data_from_endpoint(data_endpoint: EndpointConfig,
"from URL:\n{}".format(e))


def _reader_factory(fformat):
def _reader_factory(fformat: Text) -> Optional['TrainingDataReader']:
"""Generates the appropriate reader class based on the file format."""
from rasa_nlu.training_data.formats import (
MarkdownReader, WitReader, LuisReader,
Expand All @@ -100,7 +103,8 @@ def _reader_factory(fformat):
return reader


def _load(filename, language='en'):
def _load(filename: Text, language: Optional[Text] = 'en'
) -> Optional['TrainingData']:
"""Loads a single training data file from disk."""

fformat = _guess_format(filename)
Expand Down

0 comments on commit f2bb7eb

Please sign in to comment.