Adding Luis Json translation

Author: munozemilio

packages/luis/README.md

@@ -30,8 +30,8 @@ USAGE
 <!-- commands -->
 * [`bf luis:convert`](#bf-luisconvert)
 * [`bf luis:translate`](#bf-luistranslate)
-* [`bf qnamaker:convert [FILE]`](#bf-qnamakerconvert-file)
-* [`bf qnamker:convert`](#bf-qnamkerconvert)
+* [`bf qnamaker:convert`](#bf-qnamakerconvert)
+* [`bf qnamaker:translate [FILE]`](#bf-qnamakertranslate-file)
 
 ## `bf luis:convert`
 
@@ -77,39 +77,39 @@ OPTIONS
 
 _See code: [src/commands/luis/translate.ts](https://github.com/microsoft/botframework-cli/blob/v1.0.0/src/commands/luis/translate.ts)_
 
-## `bf qnamaker:convert [FILE]`
+## `bf qnamaker:convert`
 
-describe the command here
+Convert .lu file(s) to a QnA application JSON model or vice versa
 
 ```
 USAGE
-  $ bf qnamaker:convert [FILE]
+  $ bf qnamaker:convert
 
 OPTIONS
-  -f, --force
-  -h, --help       show CLI help
-  -n, --name=name  name to print
+  --alterations  Indicates if files is QnA Alterations
+  --in=in        (required) Source .qna file(s) or QnA KB JSON file
+  --log          Enables log messages
+  --name=name    Name of the QnA KB
+  --out=out      Output file or folder name. If not specified stdout will be used as output
+  --recurse      Indicates if sub-folders need to be considered to file .qna file(s)
+  --sort         When set, questions collections are alphabetically sorted are alphabetically sorted in .lu files
 ```
 
 _See code: [src/commands/qnamaker/convert.ts](https://github.com/microsoft/botframework-cli/blob/v1.0.0/src/commands/qnamaker/convert.ts)_
 
-## `bf qnamker:convert`
+## `bf qnamaker:translate [FILE]`
 
 describe the command here
 
 ```
 USAGE
-  $ bf qnamker:convert
+  $ bf qnamaker:translate [FILE]
 
 OPTIONS
-  --alterations  Indicates if files is QnA Alterations
-  --in=in        (required) Source .qna file(s) or QnA KB JSON file
-  --log          Enables log messages
-  --name=name    Name of the QnA KB
-  --out=out      Output file or folder name. If not specified stdout will be used as output
-  --recurse      Indicates if sub-folders need to be considered to file .qna file(s)
-  --sort         When set, questions collections are alphabetically sorted are alphabetically sorted in .lu files
+  -f, --force
+  -h, --help       show CLI help
+  -n, --name=name  name to print
 ```
 
-_See code: [src/commands/qnamker/convert.ts](https://github.com/microsoft/botframework-cli/blob/v1.0.0/src/commands/qnamker/convert.ts)_
+_See code: [src/commands/qnamaker/translate.ts](https://github.com/microsoft/botframework-cli/blob/v1.0.0/src/commands/qnamaker/translate.ts)_
 <!-- commandsstop -->

packages/luis/parser/translator/lutranslate.js

@@ -6,18 +6,28 @@ const retCode = require('./../lufile/enums/CLI-errors')
 const translateHelpers = require('./../lufile/translate-helpers')
 
 module.exports = {
-    translateLu: async function(files, translate_key, to_lang, src_lang, translate_comments, translate_link_text) {
+    translateLuFile: async function(files, translate_key, to_lang, src_lang, translate_comments, translate_link_text) {
         let translation = {}
         let i = 0
         while(files.length > i) {
             let file = files[i++] + ''       
             try {
-                translation[path.basename(file)] = await parseFile(file, translate_key, to_lang, src_lang, translate_comments, translate_link_text)      
+                let luObject = await parseFile(file)
+                translation[path.basename(file)] = await translateLuObject(luObject, translate_key, to_lang, src_lang, translate_comments, translate_link_text)      
             } catch (err) {
                 throw(err);
             }
          }
         return translation
+    },
+    translateLuObject: async function(luObject, translate_key, to_lang, src_lang, translate_comments, translate_link_text) {
+        let translation = {}
+        try {
+            translation['luTranslation'] = await translateLuObject(luObject, translate_key, to_lang, src_lang, translate_comments, translate_link_text)      
+        } catch (err) {
+            throw(err);
+        }
+        return translation
     }
 }
 
@@ -32,26 +42,29 @@ module.exports = {
  * @returns {void} nothing
  * @throws {exception} Throws on errors. exception object includes errCode and text. 
  */
-async function parseFile(file, translate_key, to_lang, src_lang, translate_comments, translate_link_text) {
+async function parseFile(file) {
     if(!fs.existsSync(path.resolve(file))) {
         throw(new exception(retCode.errorCode.FILE_OPEN_ERROR, 'Sorry unable to open [' + file + ']'));
     }
     let fileContent = txtfile.readSync(file);
     if (!fileContent) {
         throw(new exception(retCode.errorCode.FILE_OPEN_ERROR, 'Sorry, error reading file:' + file));
     }
+    return fileContent
+}
 
+async function translateLuObject(luObject, translate_key, to_lang, src_lang, translate_comments, translate_link_text) {
     let parsedLocContent = ''
     let result = {}
     // Support multi-language specification for targets.
     // Accepted formats are space or comma separated list of target language codes.
     // Tokenize to_lang
-    let toLang = to_lang.split(/[, ]/g);
+    let toLang = to_lang.split(/[, ]/g)
     for (idx in toLang) {
         let tgt_lang = toLang[idx].trim();
         if (tgt_lang === '') continue;
         try {
-            parsedLocContent = await translateHelpers.parseAndTranslate(fileContent, translate_key, tgt_lang, src_lang, translate_comments, translate_link_text, false, undefined)
+            parsedLocContent = await translateHelpers.parseAndTranslate(luObject, translate_key, tgt_lang, src_lang, translate_comments, translate_link_text, false, undefined)
         } catch (err) {
             throw(err);
         }

packages/luis/src/commands/luis/translate.ts

@@ -3,6 +3,8 @@ const fs = require('fs-extra')
 const path = require('path')
 const helpers = require('./../../../parser/lufile/helpers')
 const luTranslator = require('./../../../parser/translator/lutranslate')
+const luisConverter = require('./../../../parser/converters/luistoluconverter')
+const luConverter = require('./../../../parser/converters/lutoluisconverter')
 
 export default class LuisTranslate extends Command {
   static description = ' Translate given LUIS application JSON model or lu file(s)'
@@ -24,19 +26,25 @@ export default class LuisTranslate extends Command {
     try {
       const {flags} = this.parse(LuisTranslate)
       this.inputStat = await fs.stat(flags.in)
-      let outputStat = await fs.stat(flags.out)
+      let outputStat = flags.out ? await fs.stat(flags.out) : undefined
 
-      if (!this.inputStat.isFile() && outputStat.isFile()) {
+      if (!this.inputStat.isFile() && outputStat && outputStat.isFile()) {
         throw new CLIError('Specified output cannot be applied to input')
       }
 
       let isLu = !this.inputStat.isFile() ? true : path.extname(flags.in) === '.lu'
-
       let result: any
       let luFiles: any
       if (isLu) {
         luFiles = await this.getLuFiles(flags.in, flags.recurse)
-        result = await luTranslator.translateLu(luFiles, flags.translatekey, flags.tgtlang, flags.srclang, flags.translate_comments, flags.translate_link_text)
+        result = await luTranslator.translateLuFile(luFiles, flags.translatekey, flags.tgtlang, flags.srclang, flags.translate_comments, flags.translate_link_text)
+      } else {
+        result = await luisConverter.parseLuisFileToLu(flags.in, false)
+        result = await luTranslator.translateLuObject(result, flags.translatekey, flags.tgtlang, flags.srclang, flags.translate_comments, flags.translate_link_text)
+        let tempFile = path.join(__dirname, 'tempfile')
+        await fs.writeFile(tempFile, result['luTranslation'][flags.tgtlang])
+        result = await luConverter.parseLuToLuis([tempFile], false, undefined)
+        await fs.remove(tempFile)
       }
 
       if (flags.out) {

packages/luis/src/commands/qnamaker/translate.ts

@@ -0,0 +1,108 @@
+import {CLIError, Command, flags} from '@microsoft/bf-cli-command'
+const fs = require('fs-extra')
+const path = require('path')
+const helpers = require('./../../../parser/lufile/helpers')
+const luTranslator = require('./../../../parser/translator/lutranslate')
+
+export default class QnamakerTranslate extends Command {
+  static description = 'Translate given LUIS application JSON model or lu file(s)'
+
+  static flags: flags.Input<any> = {
+    in: flags.string({description: 'Source .lu file(s) or LUIS application JSON model', required: true}),
+    recurse: flags.boolean({description: 'Indicates if sub-folders need to be considered to file .lu file(s)'}),
+    out: flags.string({description: 'Output file or folder name. If not specified stdout will be used as output'}),
+    srclang: flags.string({description: 'Source lang code. Auto detect if missing.'}),
+    tgtlang: flags.string({description: 'Comma separated list of target languages.', required: true}),
+    translatekey: flags.string({description: 'Machine translation endpoint key.', required: true}),
+    translate_comments: flags.string({description: 'When set, machine translate comments found in .lu or .qna file'}),
+    translate_link_text: flags.string({description: 'When set, machine translate link description in .lu or .qna file'}),
+  }
+
+  inputStat: any
+
+  async run() {
+    try {
+      const {flags} = this.parse(QnamakerTranslate)
+      this.inputStat = await fs.stat(flags.in)
+      let outputStat = await fs.stat(flags.out)
+
+      if (!this.inputStat.isFile() && outputStat.isFile()) {
+        throw new CLIError('Specified output cannot be applied to input')
+      }
+
+      let isLu = !this.inputStat.isFile() ? true : path.extname(flags.in) === '.lu'
+
+      let result: any
+      let luFiles: any
+      if (isLu) {
+        luFiles = await this.getLuFiles(flags.in, flags.recurse)
+        result = await luTranslator.translateLuFile(luFiles, flags.translatekey, flags.tgtlang, flags.srclang, flags.translate_comments, flags.translate_link_text)
+      }
+
+      if (flags.out) {
+        let languages = flags.tgtlang.split(',')
+        await this.writeOutput(result, luFiles, isLu, languages, flags.out)
+      } else {
+        this.log(result)
+      }
+
+    } catch (err) {
+      throw err
+    }
+  }
+
+  private async getLuFiles(input: string | undefined, recurse = false): Promise<Array<any>> {
+    let filesToParse = []
+
+    if (this.inputStat.isFile()) {
+      filesToParse.push(input)
+      return filesToParse
+    }
+
+    if (!this.inputStat.isDirectory()) {
+      throw new CLIError('Sorry, ' + input + ' is not a folder or does not exist')
+    }
+
+    filesToParse = helpers.findLUFiles(input, recurse)
+
+    if (filesToParse.length === 0) {
+      throw new CLIError('Sorry, no .lu files found in the specified folder.')
+    }
+    return filesToParse
+  }
+
+
+  private async writeOutput(translatedObject: any, files: Array<string>, isLu: boolean, languages: Array<string>, out: string) {
+    let filePath = ''
+    try {
+      if (isLu) {
+        let fileIndex = 0
+        while (files.length > fileIndex) {
+          let file = files[fileIndex++] + ''
+          let lngIndex = 0
+          while (languages.length > lngIndex) {
+            let lg = languages[lngIndex++] + ''
+            filePath = await this.generateNewFilePath(path.basename(file), lg, out)
+            await fs.writeFile(filePath, translatedObject[path.basename(file)][lg], 'utf-8')
+          }
+        }
+      } else {
+        await fs.writeFile(filePath, translatedObject, 'utf-8')
+      }
+    } catch (err) {
+      throw new CLIError('Unable to write file - ' + filePath + ' Error: ' + err.message)
+    }
+    this.log('Successfully wrote translated model to ' + filePath)
+  }
+
+  private async generateNewFilePath(fileName: string, translatedLanguage: string, output: string): Promise<string> {
+    let outputStat = await fs.stat(output)
+    if (outputStat.isFile()) {
+      return path.join(process.cwd(), output)
+    } else {
+      let base = path.join(process.cwd(), output, translatedLanguage)
+      await fs.mkdirp(base)
+      return path.join(base, fileName)
+    }
+  }
+}

packages/luis/src/utils/filehelper.ts

@@ -0,0 +1,40 @@
+import {CLIError} from '@microsoft/bf-cli-command'
+const fs = require('fs-extra')
+const path = require('path')
+const helpers = require('./../../parser/lufile/helpers')
+
+export async function getLuFiles(input: string | undefined, recurse = false): Promise<Array<any>> {
+    let filesToParse = []
+    let fileStat = fs.stat(input)
+    if (fileStat.isFile()) {
+        filesToParse.push(input)
+        return filesToParse
+    }
+
+    if (!fileStat.isDirectory()) {
+        throw new CLIError('Sorry, ' + input + ' is not a folder or does not exist')
+    }
+
+    filesToParse = helpers.findLUFiles(input, recurse)
+
+    if (filesToParse.length === 0) {
+        throw new CLIError('Sorry, no .lu files found in the specified folder.')
+    }
+    return filesToParse
+}
+
+
+export async function generateNewFilePath(input: string, output: string, extension = ''): Promise<string> {
+    let outputStat = await fs.stat(output)
+    if (outputStat.isFile()) {
+        return path.join(process.cwd(), output)
+    }
+    let inputStat = await fs.stat(input)
+    let base = path.join(process.cwd(), output)
+    await fs.mkdirp(base)
+    if (inputStat.isFile()) {
+        return path.basename(input, path.extname(input)) + extension
+    }
+
+    return path.join(base, 'file'+extension)
+}

packages/luis/test/commands/qnamaker/translate.test.ts

@@ -0,0 +1,17 @@
+import {expect, test} from '@oclif/test'
+
+describe('qnamaker:translate', () => {
+  test
+    .stdout()
+    .command(['qnamaker:translate'])
+    .it('runs hello', ctx => {
+      expect(ctx.stdout).to.contain('hello world')
+    })
+
+  test
+    .stdout()
+    .command(['qnamaker:translate', '--name', 'jeff'])
+    .it('runs hello --name jeff', ctx => {
+      expect(ctx.stdout).to.contain('hello jeff')
+    })
+})