[R10] fix replace api issue (#786)

* fix qnamaker multiturn bug

* fix typo in qnamaker README

* support multi turn qna replace

Author: feich-ms

packages/lu/src/parser/qnabuild/builder.ts

@@ -170,10 +170,10 @@ export class Builder {
         // otherwise create a new kb
         if (recognizer.getKBId() && recognizer.getKBId() !== '') {
           // To see if need update the model
-          needPublish = await this.updateKB(currentKB, content.content, qnaBuildCore, recognizer, currentKB.name, delayDuration)
+          needPublish = await this.updateKB(currentKB, qnaBuildCore, recognizer, delayDuration)
         } else {
           // create a new kb
-          needPublish = await this.createKB(content.content, qnaBuildCore, recognizer, currentKB.name, delayDuration)
+          needPublish = await this.createKB(currentKB, qnaBuildCore, recognizer, delayDuration)
         }
 
         if (needPublish) {
@@ -315,36 +315,36 @@ export class Builder {
     return {kb: currentQna.kb, alterations: currentQna.alterations}
   }
 
-  async updateKB(currentKB: any, qnaContent: string, qnaBuildCore: QnaBuildCore, recognizer: Recognizer, kbName: string, delayDuration: number) {
+  async updateKB(currentKB: any, qnaBuildCore: QnaBuildCore, recognizer: Recognizer, delayDuration: number) {
     await delay(delayDuration)
     const existingKB = await qnaBuildCore.exportKB(recognizer.getKBId(), 'Prod')
 
     // compare models
     const isKBEqual = qnaBuildCore.isKBEqual(currentKB, existingKB)
     if (!isKBEqual) {
       try {
-        this.handler(`Updating to new version for kb ${kbName}...\n`)
+        this.handler(`Updating to new version for kb ${currentKB.name}...\n`)
         await delay(delayDuration)
-        await qnaBuildCore.replaceKB(recognizer.getKBId(), qnaContent)
+        await qnaBuildCore.replaceKB(recognizer.getKBId(), currentKB)
 
-        this.handler(`Updating finished for kb ${kbName}\n`)
+        this.handler(`Updating finished for kb ${currentKB.name}\n`)
       } catch (err) {
         err.text = `Updating knowledge base failed: \n${err.text}`
         throw err
       }
 
       return true
     } else {
-      this.handler(`kb ${kbName} has no changes\n`)
+      this.handler(`kb ${currentKB.name} has no changes\n`)
       return false
     }
   }
 
-  async createKB(qnaContent: string, qnaBuildCore: QnaBuildCore, recognizer: Recognizer, kbName: string, delayDuration: number) {
-    this.handler(`Creating qnamaker KB: ${kbName}...\n`)
+  async createKB(currentKB: any, qnaBuildCore: QnaBuildCore, recognizer: Recognizer, delayDuration: number) {
+    this.handler(`Creating qnamaker KB: ${currentKB.name}...\n`)
     await delay(delayDuration)
     const emptyKBJson = {
-      name: kbName,
+      name: currentKB.name,
       qnaList: [],
       urls: [],
       files: []
@@ -356,9 +356,9 @@ export class Builder {
       const opResult = await this.getKBOperationStatus(qnaBuildCore, operationId, delayDuration)
       recognizer.setKBId(opResult.resourceLocation.split('/')[2])
       await delay(delayDuration)
-      await qnaBuildCore.replaceKB(recognizer.getKBId(), qnaContent)
+      await qnaBuildCore.replaceKB(recognizer.getKBId(), currentKB)
 
-      this.handler(`Creating finished for kb ${kbName}\n`)
+      this.handler(`Creating finished for kb ${currentKB.name}\n`)
     } catch (err) {
       err.text = `Creating knowledge base failed: \n${err.text}`
       throw err

packages/lu/src/parser/qnabuild/core.ts

@@ -137,7 +137,7 @@ export class QnaBuildCore {
         id: qna.id,
         answer: qna.answer,
         source: qna.source,
-        questions: qna.questions,
+        questions: qna.questions.slice(),
         metadata: qna.metadata,
         context: qna.context
       }

packages/qnamaker/README.md

@@ -149,8 +149,7 @@ OPTIONS
 
 EXAMPLE
 
-       $ bf qnamaker:build --in {INPUT_FILE_OR_FOLDER} --subscriptionKey {SUBSCRIPTION_KEY} --botName {BOT_NAME} 
-  --dialog
+       $ bf qnamaker:build --in {INPUT_FILE_OR_FOLDER} --subscriptionKey {SUBSCRIPTION_KEY} --botName {BOT_NAME}
 ```
 
 _See code: [src/commands/qnamaker/build.ts](https://github.com/microsoft/botframework-cli/tree/master/packages/qnamaker/src/commands/qnamaker/build.ts)_

packages/qnamaker/src/commands/qnamaker/kb/replace.ts

@@ -4,10 +4,14 @@
  */
 
 import {CLIError, Command, flags} from '@microsoft/bf-cli-command'
+import {Inputs, processInputs} from '../../../utils/qnamakerbase'
 
+const qnaBuilderVerbose = require('@microsoft/bf-lu/lib/parser/qna/qnamaker/kbCollate')
+const qnaMakerBuilder = require('@microsoft/bf-lu/lib/parser/qna/qnamaker/qnaMakerBuilder')
+const fileHelper = require('@microsoft/bf-lu/lib/utils/filehelper')
+const fileExtEnum = require('@microsoft/bf-lu/lib/parser/utils/helpers').FileExtTypeEnum
 const qnamaker = require('./../../../../utils/index')
 const replaceKbJSON = require('./../../../../utils/payloads/replacekb')
-import {Inputs, processInputs} from '../../../utils/qnamakerbase'
 
 export default class QnamakerKbReplace extends Command {
   static description = 'Replace a knowledgebase contents with new contents'
@@ -32,6 +36,12 @@ export default class QnamakerKbReplace extends Command {
     if (input.requestBody.qnaDocuments && !input.requestBody.qnaList) {
       input.requestBody.qnaList = input.requestBody.qnaDocuments
       delete input.requestBody.qnaDocuments
+    } else if (flags.qnaFormat) {
+      const qnaFiles = await fileHelper.getLuObjects(stdin, flags.in, false, fileExtEnum.QnAFile)
+      const result = await qnaBuilderVerbose.build(qnaFiles)
+      const qnamaker = await qnaMakerBuilder.fromContent(result.parseToQnAContent())
+      input.requestBody = qnamaker ? JSON.parse(JSON.stringify(qnamaker.kb)) : undefined
+      flags.qnaFormat = false
     }
 
     const result = await qnamaker(input.config, input.serviceManifest, flags, input.requestBody)