Skip to content

Commit

Permalink
Merge 27c5b37 into 05407a2
Browse files Browse the repository at this point in the history
  • Loading branch information
wochinge committed Jan 31, 2019
2 parents 05407a2 + 27c5b37 commit b132c94
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Expand Up @@ -12,6 +12,7 @@ Added

Changed
-------
- validate training data only if used for training
- applied spacy guidelines on how to disable pipeline components

Removed
Expand Down
2 changes: 2 additions & 0 deletions rasa_nlu/model.py
Expand Up @@ -163,6 +163,8 @@ def train(self, data: TrainingData, **kwargs: Any)-> 'Interpreter':

self.training_data = data

self.training_data.validate()

context = kwargs

for component in self.pipeline:
Expand Down
8 changes: 4 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 @@ -56,7 +57,6 @@ def load_data(resource_name: Text,
else:
training_data = data_sets[0].merge(*data_sets[1:])

training_data.validate()
return training_data


Expand All @@ -72,15 +72,14 @@ def load_data_from_endpoint(data_endpoint: EndpointConfig,
temp_data_file = utils.create_temporary_file(response.content,
mode="w+b")
training_data = _load(temp_data_file, language)
training_data.validate()

return training_data
except Exception as e:
logger.warning("Could not retrieve training data "
"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 +99,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 b132c94

Please sign in to comment.