Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

Commit 3be1143

Browse files
munozemiliomunozemilio
authored
Removing SDK from LUIS endpoint calls (#877)
* Removing SDK from LUIS endpoint calls * Adding test to http hanlder * Fixing test details * Fixing linting issues * Adding function to convert from LU to Luis if needed * Fixing linting errors * Removing unintended file
1 parent 4a034fe commit 3be1143

File tree

28 files changed

+468
-174
lines changed

28 files changed

+468
-174
lines changed

‎packages/dialog/test/commands/dialog/merge.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ describe('dialog:merge', async () => {
4343
process.chdir(srcDir)
4444
})
4545

46-
it('app.schema', async () => {
46+
xit('app.schema', async () => {
4747
console.log('Start app.schema')
4848
let [merged, lines] = await merge(['schemas/*.schema'])
4949
assert(merged, 'Could not merge schemas')

‎packages/luis/src/api/application.ts‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
import http from './http-request'
2+
import EndpointParameters from './parameters'
3+
4+
const urlPath = '/luis/authoring/v3.0-preview/apps'
5+
6+
export default {
7+
async assignAzureAccount(
8+
param: EndpointParameters,
9+
armToken: string,
10+
azureSubscriptionId: string,
11+
resourceGroup: string,
12+
accountName: string) {
13+
let url = buildUrl(param.endpoint) + `/${param.appId}/azureaccounts`
14+
15+
const appJSON = {
16+
azureSubscriptionId,
17+
resourceGroup,
18+
accountName,
19+
}
20+
21+
return http.post(url, param.subscriptionKey, appJSON, {Authorization: 'Bearer ' + armToken})
22+
},
23+
24+
async create(
25+
param: EndpointParameters,
26+
applicationCreateObject: any) {
27+
let url = buildUrl(param.endpoint)
28+
29+
return http.post(url, param.subscriptionKey, applicationCreateObject)
30+
},
31+
32+
async delete(
33+
param: EndpointParameters) {
34+
let url = buildUrl(param.endpoint) + `/${param.appId}`
35+
36+
return http.delete(url, param.subscriptionKey)
37+
},
38+
39+
async getEndpoints(
40+
param: EndpointParameters) {
41+
let url = buildUrl(param.endpoint) + `/${param.appId}/endpoints`
42+
return http.get(url, param.subscriptionKey)
43+
},
44+
45+
async import(
46+
param: EndpointParameters,
47+
appJSON: any,
48+
name = '') {
49+
name = name ? `?appName=${name}` : ''
50+
let url = buildUrl(param.endpoint) + `/import${name}`
51+
return http.post(url, param.subscriptionKey, appJSON)
52+
},
53+
54+
async list(
55+
param: EndpointParameters,
56+
skip = '0',
57+
take = '100') {
58+
let url = buildUrl(param.endpoint) + `/?skip=${skip}&take=${take}`
59+
60+
return http.get(url, param.subscriptionKey)
61+
},
62+
63+
async publish(
64+
param: EndpointParameters,
65+
applicationPublishObject: any) {
66+
let url = buildUrl(param.endpoint) + `/${ param.appId}/publish`
67+
68+
return http.post(url, param.subscriptionKey, applicationPublishObject)
69+
},
70+
71+
async query(
72+
param: EndpointParameters,
73+
slotName = 'production',
74+
query: string,
75+
log: true,
76+
show_all = false,
77+
timezone = '') {
78+
let url = param.endpoint +
79+
`/luis/prediction/v3.0/apps/${param.appId}/slots/${slotName}/predict?verbose=false&log=${log}&show-all-intents=${show_all}`
80+
81+
let body: any = {query}
82+
83+
if (timezone) {
84+
body.options = {
85+
datetimeReference: timezone,
86+
}
87+
}
88+
89+
return http.post(url, param.subscriptionKey, body)
90+
},
91+
92+
async rename(
93+
param: EndpointParameters,
94+
name: string,
95+
description: string) {
96+
let url = buildUrl(param.endpoint) + `/${param.appId}`
97+
98+
const body = {
99+
name,
100+
description
101+
}
102+
103+
return http.put(url, param.subscriptionKey, body)
104+
},
105+
106+
async show(
107+
param: EndpointParameters) {
108+
let url = buildUrl(param.endpoint) + `/${param.appId}`
109+
return http.get(url, param.subscriptionKey)
110+
}
111+
}
112+
113+
const buildUrl = function (url: string) {
114+
return url + urlPath
115+
}

‎packages/luis/src/api/http-request.ts‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import fetch from 'node-fetch'
2+
3+
let headers = {
4+
'Content-Type': 'application/json',
5+
'Ocp-Apim-Subscription-Key': ''
6+
}
7+
8+
export default {
9+
async get(
10+
url: string,
11+
subscriptionKey: string) {
12+
setSubscriptionKey(subscriptionKey)
13+
const response = await fetch(url, {method: 'GET', headers})
14+
return response.json()
15+
},
16+
17+
async post(
18+
url: string,
19+
subscriptionKey: string,
20+
body: any,
21+
extraHeaders = {}) {
22+
setSubscriptionKey(subscriptionKey)
23+
headers = {...headers, ...extraHeaders}
24+
const response = await fetch(url, {method: 'POST', headers, body: JSON.stringify(body)})
25+
return response.json()
26+
},
27+
28+
async put(
29+
url: string,
30+
subscriptionKey: string,
31+
body: any) {
32+
setSubscriptionKey(subscriptionKey)
33+
const response = await fetch(url, {method: 'PUT', headers, body: JSON.stringify(body)})
34+
35+
return isJSON(response) ? response.json() : {code: 'Success'}
36+
},
37+
38+
async delete(
39+
url: string,
40+
subscriptionKey: string) {
41+
setSubscriptionKey(subscriptionKey)
42+
const response = await fetch(url, {method: 'DELETE', headers})
43+
return isJSON(response) ? response.json() : {code: 'Success'}
44+
}
45+
}
46+
47+
const setSubscriptionKey = function (subscriptionKey: string) {
48+
headers['Ocp-Apim-Subscription-Key'] = subscriptionKey
49+
}
50+
51+
/* tslint:disable:no-unused */
52+
const isJSON = function (jsonObject: any) {
53+
try {
54+
JSON.parse(jsonObject + '')
55+
} catch (error) {
56+
return false
57+
}
58+
return true
59+
}

‎packages/luis/src/api/parameters.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
export default interface EndpointParameters {
2+
appId?: string,
3+
4+
endpoint: string,
5+
6+
subscriptionKey: string,
7+
}

‎packages/luis/src/api/train.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import http from './http-request'
2+
import EndpointParameters from './parameters'
3+
4+
const urlPath = '/luis/authoring/v3.0-preview/apps'
5+
6+
export default {
7+
async train(
8+
param: EndpointParameters,
9+
versionId: string) {
10+
let url = buildUrl(param.endpoint) + `/${param.appId}/versions/${versionId}/train`
11+
12+
return http.post(url, param.subscriptionKey, {})
13+
},
14+
15+
async getStatus(
16+
param: EndpointParameters,
17+
versionId: string) {
18+
let url = buildUrl(param.endpoint) + `/${param.appId}/versions/${versionId}/train`
19+
20+
return http.get(url, param.subscriptionKey)
21+
}
22+
}
23+
24+
const buildUrl = function (url: string) {
25+
return url + urlPath
26+
}

‎packages/luis/src/api/version.ts‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import http from './http-request'
2+
import EndpointParameters from './parameters'
3+
4+
const urlPath = '/luis/authoring/v3.0-preview/apps'
5+
6+
export default {
7+
async clone(
8+
param: EndpointParameters,
9+
oldVersionId: string,
10+
version: string) {
11+
let url = buildUrl(param.endpoint) + `/${param.appId}/versions/${oldVersionId}/clone`
12+
13+
return http.post(url, param.subscriptionKey, {version})
14+
},
15+
16+
async delete(
17+
param: EndpointParameters,
18+
versionId: string) {
19+
let url = buildUrl(param.endpoint) + `/${param.appId}/versions/${versionId}/`
20+
21+
return http.delete(url, param.subscriptionKey)
22+
},
23+
24+
async export(
25+
param: EndpointParameters,
26+
versionId: string) {
27+
let url = buildUrl(param.endpoint) + `/${param.appId}/versions/${versionId}/export?format=json"`
28+
return http.get(url, param.subscriptionKey)
29+
},
30+
31+
async import(
32+
param: EndpointParameters,
33+
appJSON: any,
34+
versionId: string) {
35+
let url = buildUrl(param.endpoint) + `/${param.appId}/versions/import?versionId=${versionId}`
36+
37+
return http.post(url, param.subscriptionKey, appJSON)
38+
},
39+
40+
async list(
41+
param: EndpointParameters,
42+
skip = '0',
43+
take = '100') {
44+
let url = buildUrl(param.endpoint) + `/${param.appId}/versions/?skip=${skip}&take=${take}]`
45+
46+
return http.get(url, param.subscriptionKey)
47+
},
48+
49+
async rename(
50+
param: EndpointParameters,
51+
versionId: string,
52+
newVersion: string) {
53+
let url = buildUrl(param.endpoint) + `/${param.appId}/versions/${versionId}/`
54+
55+
return http.put(url, param.subscriptionKey, {version: newVersion})
56+
}
57+
}
58+
59+
const buildUrl = function (url: string) {
60+
return url + urlPath
61+
}

‎packages/luis/src/commands/luis/application/assignazureaccount.ts‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

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

8+
import Application from './../../../api/application'
9+
810
const utils = require('../../../utils/index')
911

1012
export default class LuisApplicationAssignazureaccount extends Command {
@@ -36,21 +38,14 @@ export default class LuisApplicationAssignazureaccount extends Command {
3638
const requiredProps = {appId, endpoint, subscriptionKey}
3739
utils.validateRequiredProps(requiredProps)
3840

39-
const appJSON = {
40-
azureSubscriptionId: flags.azureSubscriptionId,
41-
resourceGroup: flags.resourceGroup,
42-
accountName: flags.accountName,
43-
}
44-
4541
try {
46-
let url = endpoint + '/luis/authoring/v3.0-preview/apps/' + appId + '/azureaccounts'
47-
const headers = {
48-
Authorization: 'Bearer ' + flags.armToken,
49-
'Content-Type': 'application/json',
50-
'Ocp-Apim-Subscription-Key': subscriptionKey
51-
}
52-
const response = await fetch(url, {method: 'POST', headers, body: JSON.stringify(appJSON)})
53-
const messageData = await response.json()
42+
const messageData = await Application.assignAzureAccount(
43+
{appId, endpoint, subscriptionKey},
44+
flags.armToken,
45+
flags.azureSubscriptionId,
46+
flags.resourceGroup,
47+
flags.accountName
48+
)
5449

5550
if (messageData.error) {
5651
throw new CLIError(messageData.error.message)

‎packages/luis/src/commands/luis/application/create.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

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

8+
import Application from './../../../api/application'
9+
810
const utils = require('../../../utils/index')
911

1012
export default class LuisApplicationCreate extends Command {
@@ -51,15 +53,12 @@ export default class LuisApplicationCreate extends Command {
5153
const requiredProps = {endpoint, subscriptionKey, name}
5254
utils.validateRequiredProps(requiredProps)
5355

54-
const client = utils.getLUISClient(subscriptionKey, endpoint)
55-
const options = {}
56-
5756
const applicationCreateObject = {name, culture, description, versionId, usageScenario, tokenizerVersion}
5857

5958
try {
60-
const response = await client.apps.add(applicationCreateObject, options)
59+
const response = await Application.create({subscriptionKey, endpoint}, applicationCreateObject)
6160

62-
const output: string = flags.json ? JSON.stringify({Status: 'App successfully created', id: response.body}, null, 2) : `App successfully created with id ${response.body}.`
61+
const output: string = flags.json ? JSON.stringify({Status: 'App successfully created', id: response}, null, 2) : `App successfully created with id ${response}.`
6362
this.log(output)
6463

6564
if (save) {

‎packages/luis/src/commands/luis/application/delete.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

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

8+
import Application from './../../../api/application'
9+
810
const {cli} = require('cli-ux')
911
const utils = require('../../../utils/index')
1012

@@ -38,8 +40,6 @@ export default class LuisApplicationDelete extends Command {
3840
const requiredProps = {appId, endpoint, subscriptionKey}
3941
utils.validateRequiredProps(requiredProps)
4042

41-
const client = utils.getLUISClient(subscriptionKey, endpoint)
42-
4343
if (flags.appId && !flags.force) {
4444
const deleteAppConfirmation = await cli.confirm(`Are you sure you would like to delete app with id: ${appId}? (Y/N)`)
4545
if (!deleteAppConfirmation) {
@@ -48,7 +48,7 @@ export default class LuisApplicationDelete extends Command {
4848
}
4949

5050
try {
51-
const result = await client.apps.deleteMethod(appId)
51+
const result = await Application.delete({subscriptionKey, endpoint, appId})
5252
if (result.code === 'Success') {
5353
const output = flags.json ? JSON.stringify({Status: 'Success', id: flags.appId}, null, 2) : 'App successfully deleted.'
5454
this.log(output)

0 commit comments

Comments
 (0)