Clean cross-train config discovery code pieces (#1024)

* clean cross-train config discovery code pieces

* trigger ci

Author: feich-ms

packages/cli/README.md

@@ -823,8 +823,6 @@ OPTIONS
 
   --intentName=intentName  [default: _Interruption] Interruption intent name
 
-  --rootDialog=rootDialog  Root dialog file path
-
   --log                    [default: false] Writes out log messages to console
 ```
 
@@ -1421,8 +1419,6 @@ OPTIONS
 
   --intentName=intentName  [default: _Interruption] Interruption intent name
 
-  --rootDialog=rootDialog  Root dialog file path.
-
   --log                    [default: false] Writes out log messages to console
 ```
 

packages/lu/src/parser/cross-train/confighelper.js

@@ -8,34 +8,21 @@ const path = require('path')
 const file = require('../../utils/filehelper')
 const fileExtEnum = require('../utils/helpers').FileExtTypeEnum
 const crossTrainer = require('./crossTrainer')
-const confighelper = require('./confighelper')
 
 module.exports = {
-  /**
-   * Generate cross train config based on input folder and root dialog file.
-   * @param {string} inputFolder full path of input lu and qna files folder.
-   * @param {string} rootDialogFile full path of root dialog file.
-   * @returns {string} config object json string.
-   */
-  generateConfig: async function (inputFolder, rootDialogFile) {
-    const configStr = await confighelper.generateConfig(inputFolder, rootDialogFile)
-
-    return configStr
-  },
-
   /**
    * Cross train lu and qna files.
    * @param {string} input full path of input lu and qna files folder.
    * @param {string} intentName interruption intent name. Default value is _Interruption.
-   * @param {string} config path to config of mapping rules or mapping rules json content itself.
+   * @param {string} config path to config file of mapping rules.
    * @param {boolean} verbose verbose to indicate whether log warnings and errors or not when parsing cross-train files.
    * @returns {luResult: any, qnaResult: any} trainedResult of luResult and qnaResult or undefined if no results.
    */
   train: async function (input, intentName, config, verbose) {
     // Get all related file content.
     const luContents = await file.getFilesContent(input, fileExtEnum.LUFile)
     const qnaContents = await file.getFilesContent(input, fileExtEnum.QnAFile)
-    const configContent = config && !fs.existsSync(config) ? {id: path.join(input, 'config.json'), content: config} : await file.getConfigContent(config)
+    const configContent = await file.getConfigContent(config)
 
     const trainedResult = await crossTrainer.crossTrain(
       luContents,

packages/lu/src/parser/cross-train/cross-train.js

@@ -426,8 +426,6 @@ OPTIONS
 
   --intentName=intentName  [default: _Interruption] Interruption intent name
 
-  --rootDialog=rootDialog  Root dialog file path
-
   --log                    [default: false] Writes out log messages to console
 ```
 

packages/luis/README.md

@@ -18,7 +18,6 @@ export default class LuisCrossTrain extends Command {
     out: flags.string({char: 'o', description: 'Output folder name. If not specified, the cross trained files will be written to cross-trained folder under folder of current command'}),
     config: flags.string({description: 'Path to config file of mapping rules'}),
     intentName: flags.string({description: 'Interruption intent name', default: '_Interruption'}),
-    rootDialog: flags.string({description: 'Root dialog file path'}),
     force: flags.boolean({char: 'f', description: 'If --out flag is provided with the path to an existing file, overwrites that file', default: false}),
     log: flags.boolean({description: 'Writes out log messages to console', default: false})
   }
@@ -35,11 +34,8 @@ export default class LuisCrossTrain extends Command {
 
       if (flags.config && flags.config !== '') {
         flags.config = path.resolve(flags.config)
-      } else if (flags.rootDialog && flags.rootDialog !== '') {
-        flags.rootDialog = path.resolve(flags.rootDialog)
-        flags.config = await crossTrain.generateConfig(flags.in, flags.rootDialog)
       } else {
-        throw new CLIError('Missing cross train config. Please provide config by --config or automatically construct config with --rootDialog.')
+        throw new CLIError('Missing cross train config. Please provide config file path by --config.')
       }
 
       const trainedResult = await crossTrain.train(flags.in, flags.intentName, flags.config, flags.log)

packages/luis/src/commands/luis/cross-train.ts

@@ -26,7 +26,7 @@ describe('luis:cross-train tests for cli parameters', () => {
     .command(['luis:cross-train', '--in', `${path.join(__dirname, './../../fixtures/testcases/interruption')}`])
     .exit(1)
     .it('displays an error if config is not provided', ctx => {
-      expect(ctx.stderr).to.contain('Missing cross train config. Please provide config by --config or automatically construct config with --rootDialog.')
+      expect(ctx.stderr).to.contain('Missing cross train config. Please provide config file path by --config')
     })
 })
 
@@ -87,22 +87,6 @@ describe('luis:cross-train tests for lu and qna contents', () => {
       expect(await compareLuFiles('./../../../interruptionGen/dia2.lu', './../../fixtures/verified/interruption3/dia2.lu')).to.be.true
       expect(await compareLuFiles('./../../../interruptionGen/dia3.lu', './../../fixtures/verified/interruption3/dia3.lu')).to.be.true
     })
-
-  test
-    .stdout()
-    .command(['luis:cross-train',
-      '--in', './test/fixtures/testcases/interruption4',
-      '--intentName', '_Interruption',
-      '--out', './interruptionGen',
-      '--rootDialog', './test/fixtures/testcases/interruption4/main/main.dialog',
-      '--force'])
-    .it('luis:cross training can get expected result when automatically detecting config based on rootdialog and file system', async () => {
-      expect(await compareLuFiles('./../../../interruptionGen/main.lu', './../../fixtures/verified/interruption4/main.lu')).to.be.true
-      expect(await compareLuFiles('./../../../interruptionGen/dia1.lu', './../../fixtures/verified/interruption4/dia1.lu')).to.be.true
-      expect(await compareLuFiles('./../../../interruptionGen/dia2.lu', './../../fixtures/verified/interruption4/dia2.lu')).to.be.true
-      expect(await compareLuFiles('./../../../interruptionGen/dia3.lu', './../../fixtures/verified/interruption4/dia3.lu')).to.be.true
-      expect(await compareLuFiles('./../../../interruptionGen/dia4.lu', './../../fixtures/verified/interruption4/dia4.lu')).to.be.true
-    })
 
   test
     .stdout()