Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

307 luis version import #369

Merged
merged 3 commits into from
Nov 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions packages/luis/src/commands/luis/version/import.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*!
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License.
*/

import {CLIError, Command, flags} from '@microsoft/bf-cli-command'

const utils = require('../../../utils/index')

export default class LuisVersionImport extends Command {
static description = 'Imports a new version into a LUIS application'

static examples = [`
$ bf luis:version:import --endpoint {ENDPOINT} --subscriptionKey {SUBSCRIPTION_KEY} --appId {APP_ID} --in {PATH_TO_JSON} --versionId {VERSION_ID}
$ echo {SERIALIZED_JSON} | bf luis:version:import --endpoint {ENDPOINT} --subscriptionKey {SUBSCRIPTION_KEY} --appId {APP_ID}
`]

static flags = {
help: flags.help({char: 'h'}),
appId: flags.string({description: 'LUIS application Id'}),
versionId: flags.string({description: 'LUIS application version to import'}),
endpoint: flags.string({description: 'LUIS endpoint hostname'}),
subscriptionKey: flags.string({description: 'LUIS cognitive services subscription key (aka Ocp-Apim-Subscription-Key)'}),
in: flags.string({char: 'i', description: 'File path containing LUIS application contents'})
}

async run() {
const {flags} = this.parse(LuisVersionImport)
const flagLabels = Object.keys(LuisVersionImport.flags)
const configDir = this.config.configDir
const stdin = await this.readStdin()
const options: any = {}

let {appId, versionId, endpoint, subscriptionKey, inVal} = await utils.processInputs(flags, flagLabels, configDir)

const requiredProps = {appId, endpoint, subscriptionKey}
utils.validateRequiredProps(requiredProps)

inVal = inVal ? inVal.trim() : flags.in

const appJSON = stdin ? stdin : await utils.getInputFromFile(inVal)
if (!appJSON) throw new CLIError('No import data found - please provide input through stdin or the --in flag')

if (versionId) options.versionId = versionId

const client = utils.getLUISClient(subscriptionKey, endpoint)

try {
const newVersionId = await client.versions.importMethod(appId, JSON.parse(appJSON), options)
this.log(`App version successfully imported as version ${newVersionId}.`)
} catch (err) {
throw new CLIError(`Failed to import app version: ${err}`)
}
}

}
92 changes: 92 additions & 0 deletions packages/luis/test/commands/luis/version/import.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
import {expect, test} from '@oclif/test'
const sinon = require('sinon')
const uuidv1 = require('uuid/v1')
const utils = require('../../../../src/utils/index')

describe('luis:version:import', () => {

beforeEach(() => {
sinon.stub(utils, 'processInputs').returnsArg(0)

})

afterEach(() => {
sinon.restore();
});

test
.stdout()
.command(['luis:version:import', '--help'])
.it('should print the help contents when --help is passed as an argument', ctx => {
expect(ctx.stdout).to.contain('Imports a new version into a LUIS application')
})

test
.stdout()
.stderr()
.command(['luis:version:import', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--subscriptionKey', uuidv1()])
.it('displays an error if any required input parameters are missing', ctx => {
expect(ctx.stderr).to.contain(`Required input property 'appId' missing.`)
})

test
.stdout()
.stderr()
.command(['luis:version:import', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--appId', uuidv1()])
.it('displays an error if any required input parameters are missing', ctx => {
expect(ctx.stderr).to.contain(`Required input property 'subscriptionKey' missing.`)
})

test
.nock('https://westus.api.cognitive.microsoft.com', api => api
.post(uri => uri.includes('apps'))
.reply(201, '0.9')
)
.stdout()
.stderr()
.command(['luis:version:import', '--appId', uuidv1(), '--in', './test/fixtures/sample-app-version.json', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--subscriptionKey', uuidv1(), '--appId', uuidv1()])
.it('imports a luis app version from a file and returns the app\'s new version id', ctx => {
expect(ctx.stdout).to.contain('App version successfully imported as version 0.9')
})

test
.nock('https://westus.api.cognitive.microsoft.com', api => api
.post(uri => uri.includes('apps'))
.reply(201, '0.7')
)
.stdout()
.stderr()
.command(['luis:version:import', '--versionId', '0.7', '--appId', uuidv1(), '--in', './test/fixtures/sample-app-version.json', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--subscriptionKey', uuidv1(), '--appId', uuidv1()])
.it('imports a luis app version from a file and returns the app\'s new version id, as specified by the versionId flag', ctx => {
expect(ctx.stdout).to.contain('App version successfully imported as version 0.7')
})

test
.stdout()
.stderr()
.command(['luis:version:import', '--appId', uuidv1(), '--in', './test/fixtures/xyz.json', '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--subscriptionKey', uuidv1()])
.it('displays an error message if the import file cannot be found', ctx => {
expect(ctx.stderr).to.contain('Failed to read app JSON')
})

test
.stdout()
.stderr()
.command(['luis:version:import', '--appId', uuidv1(), '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--subscriptionKey', uuidv1()])
.it('displays an error message if no input data detected', ctx => {
expect(ctx.stderr).to.contain('No import data found - please provide input through stdin or the --in flag')
})

test
.stdin('{"luis_schema_version": "4.0.0","versionId": "0.9","name": "sampleapp","desc": "test description","culture": "en-us","tokenizerVersion": "1.0.0","intents": [{"name": "None"}],"entities": [],"composites": [],"closedLists": [],"patternAnyEntities": [],"regex_entities": [],"prebuiltEntities": [],"model_features": [],"regex_features": [],"patterns": [],"utterances": [],"settings": []}')
.stdout()
.stderr()
.command(['luis:version:import', '--appId', uuidv1(), '--endpoint', 'https://westus.api.cognitive.microsoft.com', '--subscriptionKey', uuidv1()])
.it('imports a luis app version from stdin and returns the app\'s id', ctx => {
process.stdin.setEncoding('utf8')
process.stdin.once('data', data => {
expect(ctx.stderr).to.contain('App version successfully imported as version 0.9')
})
})

})
24 changes: 24 additions & 0 deletions packages/luis/test/fixtures/sample-app-version.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"luis_schema_version": "4.0.0",
"versionId": "0.9",
"name": "minimal-sample_app",
"desc": "test description",
"culture": "en-us",
"tokenizerVersion": "1.0.0",
"intents": [
{
"name": "None"
}
],
"entities": [],
"composites": [],
"closedLists": [],
"patternAnyEntities": [],
"regex_entities": [],
"prebuiltEntities": [],
"model_features": [],
"regex_features": [],
"patterns": [],
"utterances": [],
"settings": []
}