Fix for luis import (#663)

Author: munozemilio

common/config/rush/pnpm-lock.yaml

@@ -36,6 +36,7 @@
   "dependencies": {
     "@azure/cognitiveservices-luis-authoring": "4.0.0-preview.1",
     "@azure/ms-rest-azure-js": "2.0.1",
+    "@types/node-fetch": "~2.5.5",
     "antlr4": "^4.7.2",
     "chalk": "2.4.1",
     "console-stream": "^0.1.1",
@@ -46,7 +47,7 @@
     "globby": "^10.0.1",
     "intercept-stdout": "^0.1.2",
     "lodash": "^4.17.15",
-    "node-fetch": "^2.1.2",
+    "node-fetch": "~2.6.0",
     "semver": "^5.5.1",
     "tslib": "^1.10.0"
   },

packages/lu/package.json

@@ -309,7 +309,7 @@ export class Builder {
     this.handler(`Creating LUIS.ai application: ${currentApp.name} version:${currentApp.versionId}\n`)
     await delay(delayDuration)
     const response = await luBuildCore.importApplication(currentApp)
-    recognizer.setAppId(typeof response.body === 'string' ? response.body : response.body[Object.keys(response.body)[0]])
+    recognizer.setAppId(typeof response === 'string' ? response : response[Object.keys(response)[0]])
     return true
   }
 

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

@@ -10,15 +10,21 @@ import {isEqual, differenceWith} from 'lodash'
 import {CognitiveServicesCredentials} from '@azure/ms-rest-azure-js'
 import {LUISAuthoringClient} from '@azure/cognitiveservices-luis-authoring'
 import * as path from 'path'
+import fetch from 'node-fetch'
+const retCode = require('./../utils/enums/CLI-errors')
+const exception = require('./../utils/exception')
 const Content = require('./../lu/lu')
 const LUOptions = require('./../lu/luOptions')
 
 export class LuBuildCore {
   private readonly client: any
+  private readonly subscriptionKey: string
+  private readonly endpoint: string
 
-  constructor(authoringKey: string, endpoint: string) {
-    // new luis api client
-    const creds = new CognitiveServicesCredentials(authoringKey)
+  constructor(subscriptionKey: string, endpoint: string) {
+    this.subscriptionKey = subscriptionKey
+    this.endpoint = endpoint
+    const creds = new CognitiveServicesCredentials(subscriptionKey)
     this.client = new LUISAuthoringClient(creds, endpoint)
   }
 
@@ -35,9 +41,23 @@ export class LuBuildCore {
   }
 
   public async importApplication(currentApp: any): Promise<any> {
-    let response = await this.client.apps.importMethod(currentApp)
+    // let response = await this.client.apps.importMethod(currentApp)
 
-    return response
+    const name = `?appName=${currentApp.name}`
+    const url = this.endpoint + '/luis/authoring/v3.0-preview/apps/import' + name
+    const headers = {
+      'Content-Type': 'application/json',
+      'Ocp-Apim-Subscription-Key': this.subscriptionKey
+    }
+
+    const response = await fetch(url, {method: 'POST', headers, body: JSON.stringify(currentApp)})
+    const messageData = await response.json()
+
+    if (messageData.error) {
+      throw (new exception(retCode.errorCode.LUIS_API_CALL_FAILED, messageData.error.message))
+    }
+
+    return messageData
   }
 
   public async exportApplication(appId: string, versionId: string) {
@@ -91,7 +111,23 @@ export class LuBuildCore {
   }
 
   public async importNewVersion(appId: string, app: any, options: any) {
-    await this.client.versions.importMethod(appId, app, options)
+    // await this.client.versions.importMethod(appId, app, options)
+
+    const versionId = `?versionId=${options.versionId}`
+    let url = this.endpoint + '/luis/authoring/v3.0-preview/apps/' + appId + '/versions/import' + versionId
+    const headers = {
+      'Content-Type': 'application/json',
+      'Ocp-Apim-Subscription-Key': this.subscriptionKey
+    }
+
+    const response = await fetch(url, {method: 'POST', headers, body: JSON.stringify(app)})
+    const messageData = await response.json()
+
+    if (messageData.error) {
+      throw (new exception(retCode.errorCode.LUIS_API_CALL_FAILED, messageData.error.message))
+    }
+
+    return messageData
   }
 
   public async listApplicationVersions(appId: string) {

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

@@ -28,6 +28,7 @@ module.exports = {
         INVALID_URI:                21,
         INVALID_REGEX_ENTITY:       22,
         INVALID_COMPOSITE_ENTITY:   23,
+        LUIS_API_CALL_FAILED:       24,
         UNKNOWN_ERROR:              99,
         BOUNDARY_INTENTS:           501,
         BOUNDARY_PATTERNANYENTITY:  502,

packages/lu/src/parser/utils/enums/CLI-errors.js

@@ -46,10 +46,12 @@
     "@oclif/command": "~1.5.19",
     "@oclif/config": "~1.13.3",
     "@oclif/errors": "~1.2.2",
+    "@types/node-fetch": "~2.5.5",
     "@types/sinon": "^7.5.0",
     "cli-ux": "~5.3.3",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.15",
+    "node-fetch": "~2.6.0",
     "tslib": "^1.10.0",
     "username": "^4.1.0"
   },

packages/luis/package.json

@@ -4,6 +4,7 @@
  */
 
 import {CLIError, Command, flags} from '@microsoft/bf-cli-command'
+import fetch from 'node-fetch'
 
 const utils = require('../../../utils/index')
 
@@ -41,15 +42,28 @@ export default class LuisApplicationImport extends Command {
     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')
 
-    const client = utils.getLUISClient(subscriptionKey, endpoint)
+    // const client = utils.getLUISClient(subscriptionKey, endpoint)
 
     const options: any = {}
     if (name) options.appName = name
 
     try {
-      const response = await client.apps.importMethod(JSON.parse(appJSON), options)
+      // const response = await client.apps.importMethod(JSON.parse(appJSON), options)
 
-      const output: string = flags.json ? JSON.stringify({Status: 'Success', id: response.body}, null, 2) : `App successfully imported with id ${response.body}.`
+      name = name ? '?appName=' + name : ''
+      let url = endpoint + '/luis/authoring/v3.0-preview/apps/import' + name
+      const headers = {
+        'Content-Type': 'application/json',
+        'Ocp-Apim-Subscription-Key': subscriptionKey
+      }
+      const response = await fetch(url, {method: 'POST', headers, body: appJSON})
+      const messageData = await response.json()
+
+      if (messageData.error) {
+        throw new CLIError(messageData.error.message)
+      }
+
+      const output: string = flags.json ? JSON.stringify({Status: 'Success', id: messageData}, null, 2) : `App successfully imported with id ${messageData}.`
       this.log(output)
 
       if (flags.save) {