Merge pull request #209 from microsoft/emimunoz/qnamaker

Changing create kb output to return json

Author: munozemilio

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

@@ -74,7 +74,7 @@ export default class QnamakerCreateKb extends Command {
       userConfig.qnamaker = input.config
       await fs.writeJson(path.join(this.config.configDir, 'config.json'), userConfig, {spaces: 2})
     } else {
-      this.log('Knowledge Base id: ' + kbId)
+      this.log(JSON.stringify({kbId}, null, 2))
     }
   }
 

packages/qnamaker/src/commands/qnamaker/query.ts

@@ -7,13 +7,15 @@ export default class QnamakerQuery extends Command {
   static description = 'Generate Answer for fetching the answer from Kb for a query'
 
   static flags: flags.Input<any> = {
-    question: flags.string({description: 'Query to get a prediction for.', required: true}),
+    question: flags.string({description: 'Query to get a prediction for', required: true}),
     top: flags.integer({description: 'Specifies the number of matching results'}),
-    test: flags.boolean({description: 'Query against the test index.', default: false}),
+    test: flags.boolean({description: 'Query against the test index', default: false}),
     scorethreshold: flags.integer({description: 'Specifies the confidence score threshold for the returned answer.'}),
-    strictfilters: flags.string({description: 'Path to json file {"strictfilters": MetadataDTO[]}'}),
-    hostname: flags.string({description: 'Specifies the url for your private QnA service. Overrides the value present in config.'}),
-    endpointKey: flags.string({description: 'Specifies the endpoint key for your private QnA service (From qnamaker.ai portal user settings page). Overrides the value present in config.'}),
+    strictfilters: flags.string({description: 'Path to json file with MetadataDTO[] e.g {"strictfilters": MetadataDTO[]}'}),
+    qnaId: flags.integer({description: 'Exact qnaId to fetch from the knowledgebase, this field takes priority over question'}),
+    context: flags.string({description: 'Path to Context object json file with previous QnA'}),
+    hostname: flags.string({description: 'Specifies the url for your private QnA service. Overrides the value present in config'}),
+    endpointKey: flags.string({description: 'Specifies the endpoint key for your private QnA service (From qnamaker.ai portal user settings page). Overrides the value present in config'}),
     kbId: flags.string({description: 'Specifies the active qnamaker knowledgebase id. Overrides the value present in the config'}),
     help: flags.help({char: 'h', description: 'qnamaker:query command help'}),
   }
@@ -30,6 +32,10 @@ export default class QnamakerQuery extends Command {
       input.requestBody.top = flags.top
     }
 
+    if (flags.qnaId) {
+      input.requestBody.qnaId = flags.qnaId
+    }
+
     if (flags.scorethreshold) {
       input.requestBody.scoreThreshold = flags.scorethreshold
     }
@@ -43,6 +49,15 @@ export default class QnamakerQuery extends Command {
       }
     }
 
+    if (flags.context) {
+      try {
+        let ctx = await getFileInput(flags.context)
+        input.requestBody.context = ctx
+      } catch (error) {
+        throw new CLIError(error.message)
+      }
+    }
+
     const result = await qnamaker(input.config, input.serviceManifest, flags, input.requestBody)
     if (result.error) {
       throw new CLIError(JSON.stringify(result.error, null, 4))

packages/qnamaker/test/commands/qnamaker/create/kb.test.ts

@@ -43,7 +43,8 @@ describe('qnamaker:create:kb', () => {
   .stdout()
   .command(['qnamaker:create:kb','--in', `${path.join(__dirname, '../../../fixtures/kb.json')}`])
   .it('Creates kb qnamaker:create:kb --in', ctx => {
-    expect(ctx.stdout).to.contain('Knowledge Base id: 8600c573-2acf-4466-97e8-999ad4cecbc2')
+    let response = JSON.parse(ctx.stdout)
+    expect(response.kbId).to.be.equal('8600c573-2acf-4466-97e8-999ad4cecbc2')
   })
 })