Merge pull request RasaHQ#3319 from RasaHQ/cli-arguments-train-core

rasa train core: use additional training arguments

Author: tabergma

.travis.yml

@@ -19,7 +19,7 @@ install:
   - python -m pip install -U pip
   - pip install git+https://github.com/tmbo/MITIE.git
   - pip install -r requirements-dev.txt
-  - pip install -e .
+  - pip install -e . --no-use-pep517
   - pip install coveralls==1.3.0
   - pip install https://github.com/explosion/spacy-models/releases/download/en_core_web_md-2.0.0/en_core_web_md-2.0.0.tar.gz --no-cache-dir > jnk
   - python -m spacy link en_core_web_md en

CHANGELOG.rst

@@ -55,3 +55,4 @@ Fixed
   Store
 - ``rasa nlu test`` doesn't error anymore when a test file is passed with ``-u``
 - in interactive learning: only updates entity values if user changes annotation
+- ``rasa train core`` actually uses additional arguments, such as `augmentation`

rasa/cli/train.py

@@ -118,7 +118,14 @@ def train(args: argparse.Namespace) -> Optional[Text]:
         get_validated_path(f, "data", DEFAULT_DATA_PATH) for f in args.data
     ]
 
-    return rasa.train(domain, config, training_files, args.out, args.force)
+    return rasa.train(
+        domain,
+        config,
+        training_files,
+        args.out,
+        args.force,
+        extract_additional_arguments(args),
+    )
 
 
 def train_core(
@@ -143,7 +150,14 @@ def train_core(
 
         config = get_validated_path(args.config, "config", DEFAULT_CONFIG_PATH)
 
-        return train_core(args.domain, config, stories, output, train_path)
+        return train_core(
+            args.domain,
+            config,
+            stories,
+            output,
+            train_path,
+            extract_additional_arguments(args),
+        )
     else:
         from rasa.core.train import do_compare_training
 
@@ -162,3 +176,13 @@ def train_nlu(
     nlu_data = get_validated_path(args.nlu, "nlu", DEFAULT_DATA_PATH)
 
     return train_nlu(config, nlu_data, output, train_path)
+
+
+def extract_additional_arguments(args: argparse.Namespace) -> typing.Dict:
+    return {
+        "augmentation_factor": args.augmentation,
+        "dump_stories": args.dump_stories,
+        "debug_plots": args.debug_plots,
+        "percentages": args.percentages,
+        "runs": args.runs,
+    }

rasa/train.py

@@ -2,7 +2,7 @@
 import os
 import tempfile
 import typing
-from typing import Text, Optional, List, Union
+from typing import Text, Optional, List, Union, Dict
 
 from rasa import model, data
 from rasa.cli.utils import create_output_path, print_success
@@ -18,10 +18,11 @@ def train(
     training_files: Union[Text, List[Text]],
     output: Text = DEFAULT_MODELS_PATH,
     force_training: bool = False,
+    kwargs: Optional[Dict] = None,
 ) -> Optional[Text]:
     loop = asyncio.get_event_loop()
     return loop.run_until_complete(
-        train_async(domain, config, training_files, output, force_training)
+        train_async(domain, config, training_files, output, force_training, kwargs)
     )
 
 
@@ -31,6 +32,7 @@ async def train_async(
     training_files: Union[Text, List[Text]],
     output: Text = DEFAULT_MODELS_PATH,
     force_training: bool = False,
+    kwargs: Optional[Dict] = None,
 ) -> Optional[Text]:
     """Trains a Rasa model (Core and NLU).
 
@@ -40,6 +42,7 @@ async def train_async(
         training_files: Paths to the training data for Core and NLU.
         output: Output path.
         force_training: If `True` retrain model even if data has not changed.
+        kwargs: Additional training parameters.
 
     Returns:
         Path of the trained model archive.
@@ -69,7 +72,9 @@ async def train_async(
             retrain_nlu = not model.merge_model(old_nlu, target_path)
 
     if force_training or retrain_core:
-        await train_core_async(domain, config, story_directory, output, train_path)
+        await train_core_async(
+            domain, config, story_directory, output, train_path, kwargs
+        )
     else:
         print (
             "Dialogue data / configuration did not change. "
@@ -100,16 +105,26 @@ async def train_async(
 
 
 def train_core(
-    domain: Text, config: Text, stories: Text, output: Text, train_path: Optional[Text]
+    domain: Text,
+    config: Text,
+    stories: Text,
+    output: Text,
+    train_path: Optional[Text],
+    kwargs: Optional[Dict],
 ) -> Optional[Text]:
     loop = asyncio.get_event_loop()
     return loop.run_until_complete(
-        train_core_async(domain, config, stories, output, train_path)
+        train_core_async(domain, config, stories, output, train_path, kwargs)
     )
 
 
 async def train_core_async(
-    domain: Text, config: Text, stories: Text, output: Text, train_path: Optional[Text]
+    domain: Text,
+    config: Text,
+    stories: Text,
+    output: Text,
+    train_path: Optional[Text] = None,
+    kwargs: Optional[Dict] = None,
 ) -> Optional[Text]:
     """Trains a Core model.
 
@@ -120,6 +135,7 @@ async def train_core_async(
         output: Output path.
         train_path: If `None` the model will be trained in a temporary
             directory, otherwise in the provided directory.
+        kwargs: Additional training parameters.
 
     Returns:
         If `train_path` is given it returns the path to the model archive,
@@ -136,6 +152,7 @@ async def train_core_async(
         stories_file=stories,
         output_path=os.path.join(_train_path, "core"),
         policy_config=config,
+        kwargs=kwargs,
     )
 
     if not train_path: