Change --data type in 'rasa data validate' command

changelog/8225.improvement.md

@@ -0,0 +1 @@
+Changed --data option type in the ``rasa data validate``` command to allow more than one path to be passed.

data/test_config/config_defaults.yml

@@ -14,12 +14,10 @@ pipeline: []
 #   - name: DIETClassifier
 #     epochs: 100
 #     constrain_similarities: true
-#     model_confidence: cosine
 #   - name: EntitySynonymMapper
 #   - name: ResponseSelector
 #     epochs: 100
 #     constrain_similarities: true
-#     model_confidence: cosine
 #   - name: FallbackClassifier
 #     threshold: 0.3
 #     ambiguity_threshold: 0.1

rasa/cli/arguments/default_arguments.py

@@ -105,9 +105,10 @@ def add_data_param(
 ) -> None:
     parser.add_argument(
         "--data",
-        type=str,
         default=default,
-        help=f"Path to the file or directory containing {data_type} data.",
+        nargs="+",
+        type=str,
+        help=f"Paths to the files or directories containing {data_type} data.",
         required=required,
     )
 

rasa/cli/data.py

@@ -3,7 +3,7 @@
 import os
 import shutil
 from pathlib import Path
-from typing import Dict, List, Text, TYPE_CHECKING
+from typing import Dict, Union, List, Text, TYPE_CHECKING
 
 import rasa.shared.core.domain
 from rasa import telemetry
@@ -376,9 +376,12 @@ def _migrate_responses(args: argparse.Namespace) -> None:
 
 
 async def _convert_to_yaml(
-    out_path: Text, data_path: Text, converter: "TrainingDataConverter"
+    out_path: Text, data_path: Union[list, Text], converter: "TrainingDataConverter"
 ) -> None:
 
+    if isinstance(data_path, list):
+        data_path = data_path[0]
+
     output = Path(out_path)
     if not os.path.exists(output):
         rasa.shared.utils.cli.print_error_and_exit(

rasa/nlu/convert.py

@@ -1,15 +1,30 @@
 import argparse
 import os
-from typing import Text
+from typing import Text, Union
 
 from rasa.shared.utils.cli import print_error
 import rasa.shared.nlu.training_data.loading
 from rasa.nlu.utils import write_to_file
 
 
 def convert_training_data(
-    data_file: Text, out_file: Text, output_format: Text, language: Text
+    data_file: Union[list, Text], out_file: Text, output_format: Text, language: Text
 ) -> None:
+    """Convert training data.
+
+    Args:
+        data_file (Union[list, Text]): Path to the file or directory
+            containing Rasa data.
+        out_file (Text): File or existing path where to save
+            training data in Rasa format.
+        output_format (Text): Output format the training data
+            should be converted into.
+        language (Text): Language of the data.
+    """
+
+    if isinstance(data_file, list):
+        data_file = data_file[0]
+
     if not os.path.exists(data_file):
         print_error(
             "Data file '{}' does not exist. Provide a valid NLU data file using "

tests/cli/test_rasa_data.py

@@ -95,7 +95,7 @@ def test_data_convert_help(run: Callable[..., RunResult]):
     output = run("data", "convert", "nlu", "--help")
 
     help_text = """usage: rasa data convert nlu [-h] [-v] [-vv] [--quiet] [-f {json,md,yaml}]
-                             --data DATA [--out OUT] [-l LANGUAGE]"""
+                             --data DATA [DATA ...] [--out OUT] [-l LANGUAGE]"""
 
     lines = help_text.split("\n")
     # expected help text lines should appear somewhere in the output
@@ -109,7 +109,9 @@ def test_data_validate_help(run: Callable[..., RunResult]):
 
     help_text = """usage: rasa data validate [-h] [-v] [-vv] [--quiet]
                           [--max-history MAX_HISTORY] [-c CONFIG]
-                          [--fail-on-warnings] [-d DOMAIN] [--data DATA]"""
+                          [--fail-on-warnings] [-d DOMAIN]
+                          [--data DATA [DATA ...]]
+                          {stories} ..."""
 
     lines = help_text.split("\n")
     # expected help text lines should appear somewhere in the output

tests/cli/test_rasa_x.py

@@ -16,8 +16,8 @@
 def test_x_help(run: Callable[..., RunResult]):
     output = run("x", "--help")
 
-    help_text = """usage: rasa x [-h] [-v] [-vv] [--quiet] [-m MODEL] [--data DATA] [-c CONFIG]
-              [-d DOMAIN] [--no-prompt] [--production]
+    help_text = """usage: rasa x [-h] [-v] [-vv] [--quiet] [-m MODEL] [--data DATA [DATA ...]]
+              [-c CONFIG] [-d DOMAIN] [--no-prompt] [--production]
               [--rasa-x-port RASA_X_PORT] [--config-endpoint CONFIG_ENDPOINT]
               [--log-file LOG_FILE] [--endpoints ENDPOINTS] [-p PORT]
               [-t AUTH_TOKEN] [--cors [CORS [CORS ...]]] [--enable-api]