refactor error message of luis build and qnamaker build (#1025)

Author: feich-ms

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

@@ -207,71 +207,75 @@ export class Builder {
     const filesSectionEmptyStatus = fileHelper.filesSectionEmptyStatus(clonedLuContents)
     let isAllLuEmpty = [...filesSectionEmptyStatus.values()].every((isEmpty) => isEmpty)
 
-    if (!isAllLuEmpty) {
-      const luBuildCore = new LuBuildCore(authoringKey, endpoint, retryCount, retryDuration)
-      const apps = await luBuildCore.getApplicationList()
-
-      let settings: any
-
-      // here we do a while loop to make full use of luis tps capacity
-      while (clonedLuContents.length > 0) {
-        // get a number(set by luisApiTps) of contents for each loop
-        const subLuContents = clonedLuContents.splice(0, luisAPITPS)
-
-        // concurrently handle applications
-        await Promise.all(subLuContents.map(async content => {
-          if (!filesSectionEmptyStatus.get(content.path)) {
-            // init current application object from lu content
-            let currentApp = await this.initApplicationFromLuContent(content, botName, suffix)
-
-            // init recognizer asset
-            const dialogFile = path.join(path.dirname(content.path), `${content.name}.dialog`)
-            let recognizer = new Recognizer(content.path, content.name, dialogFile, schema)
-
-            // find if there is a matched name with current app under current authoring key
-            if (!recognizer.getAppId()) {
-              for (let app of apps) {
-                if (app.name === currentApp.name) {
-                  recognizer.setAppId(app.id)
-                  break
+    try {
+      if (!isAllLuEmpty) {
+        const luBuildCore = new LuBuildCore(authoringKey, endpoint, retryCount, retryDuration)
+        const apps = await luBuildCore.getApplicationList()
+
+        let settings: any
+
+        // here we do a while loop to make full use of luis tps capacity
+        while (clonedLuContents.length > 0) {
+          // get a number(set by luisApiTps) of contents for each loop
+          const subLuContents = clonedLuContents.splice(0, luisAPITPS)
+
+          // concurrently handle applications
+          await Promise.all(subLuContents.map(async content => {
+            if (!filesSectionEmptyStatus.get(content.path)) {
+              // init current application object from lu content
+              let currentApp = await this.initApplicationFromLuContent(content, botName, suffix)
+
+              // init recognizer asset
+              const dialogFile = path.join(path.dirname(content.path), `${content.name}.dialog`)
+              let recognizer = new Recognizer(content.path, content.name, dialogFile, schema)
+
+              // find if there is a matched name with current app under current authoring key
+              if (!recognizer.getAppId()) {
+                for (let app of apps) {
+                  if (app.name === currentApp.name) {
+                    recognizer.setAppId(app.id)
+                    break
+                  }
                 }
               }
-            }
 
-            let needTrainAndPublish = false
+              let needTrainAndPublish = false
 
-            // compare models to update the model if a match found
-            // otherwise create a new application
-            if (recognizer.getAppId() && recognizer.getAppId() !== '') {
-              // To see if need update the model
-              needTrainAndPublish = await this.updateApplication(currentApp, luBuildCore, recognizer, timeBucketOfRequests, keptVersionCount)
-            } else {
-              // create a new application
-              needTrainAndPublish = await this.createApplication(currentApp, luBuildCore, recognizer, timeBucketOfRequests)
-            }
+              // compare models to update the model if a match found
+              // otherwise create a new application
+              if (recognizer.getAppId() && recognizer.getAppId() !== '') {
+                // To see if need update the model
+                needTrainAndPublish = await this.updateApplication(currentApp, luBuildCore, recognizer, timeBucketOfRequests, keptVersionCount)
+              } else {
+                // create a new application
+                needTrainAndPublish = await this.createApplication(currentApp, luBuildCore, recognizer, timeBucketOfRequests)
+              }
 
-            if (needTrainAndPublish) {
-              // train and publish application
-              await this.trainAndPublishApplication(luBuildCore, recognizer, timeBucketOfRequests, isStaging)
-            }
+              if (needTrainAndPublish) {
+                // train and publish application
+                await this.trainAndPublishApplication(luBuildCore, recognizer, timeBucketOfRequests, isStaging)
+              }
 
-            // init settings asset
-            if (settings === undefined) {
-              const settingsPath = path.join(path.dirname(content.path), `luis.settings.${suffix}.${region}.json`)
-              settings = new Settings(settingsPath, {})
-            }
+              // init settings asset
+              if (settings === undefined) {
+                const settingsPath = path.join(path.dirname(content.path), `luis.settings.${suffix}.${region}.json`)
+                settings = new Settings(settingsPath, {})
+              }
 
-            // update settings asset
-            settings.luis[content.name.split('.').join('_').replace(/-/g, '_')] = {
-              "appId": recognizer.getAppId(),
-              "version": recognizer.versionId
+              // update settings asset
+              settings.luis[content.name.split('.').join('_').replace(/-/g, '_')] = {
+                "appId": recognizer.getAppId(),
+                "version": recognizer.versionId
+              }
             }
-          }
-        }))
-      }
+          }))
+        }
 
-      // write dialog assets
-      settingsAssets.push(settings)
+        // write dialog assets
+        settingsAssets.push(settings)
+      }
+    } catch (error) {
+      throw(new exception(retCode.errorCode.LUIS_BUILD_FAILED, `Luis build failed: ${error.message}`))
     }
 
     const settingsContent = this.generateDeclarativeAssets(settingsAssets)

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

@@ -8,8 +8,6 @@ import {LUISAuthoringClient} from '@azure/cognitiveservices-luis-authoring'
 import fetch from 'node-fetch'
 
 const delay = require('delay')
-const retCode = require('./../utils/enums/CLI-errors')
-const exception = require('./../utils/exception')
 const Luis = require('./../luis/luis')
 
 const rateLimitErrorCode = 429
@@ -30,7 +28,7 @@ export class LuBuildCore {
 
     // check endpoint is absolute or not
     if (!absoluteUrlPattern.test(endpoint)) {
-      throw (new exception(retCode.errorCode.INVALID_URI, `Only absolute URLs are supported. "${endpoint}" is not an absolute LUIS endpoint URL.`))
+      throw new Error(`Only absolute URLs are supported. "${endpoint}" is not an absolute LUIS endpoint URL.`)
     }
 
     // new luis api client
@@ -114,12 +112,12 @@ export class LuBuildCore {
         retryCount--
         if (retryCount > 0) await delay(this.retryDuration)
       } else {
-        throw (new exception(retCode.errorCode.LUIS_API_CALL_FAILED, error.message))
+        throw error
       }
     }
 
     if (retryCount === 0) {
-      throw (new exception(retCode.errorCode.LUIS_API_CALL_FAILED, error.message))
+      throw error
     }
 
     return messageData
@@ -156,7 +154,7 @@ export class LuBuildCore {
     }
 
     if (messageData.error) {
-      throw (new exception(retCode.errorCode.LUIS_API_CALL_FAILED, messageData.error.message))
+      throw new Error(messageData.error.message)
     }
 
     return messageData
@@ -236,12 +234,12 @@ export class LuBuildCore {
         retryCount--
         if (retryCount > 0) await delay(this.retryDuration)
       } else {
-        throw (new exception(retCode.errorCode.LUIS_API_CALL_FAILED, error.message))
+        throw error
       }
     }
 
     if (retryCount === 0) {
-      throw (new exception(retCode.errorCode.LUIS_API_CALL_FAILED, error.message))
+      throw error
     }
 
     return messageData

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

@@ -189,73 +189,77 @@ export class Builder {
         })
       }
 
-      const qnaBuildCore = new QnaBuildCore(subscriptionkey, endpoint)
-      const kbs = (await qnaBuildCore.getKBList()).knowledgebases
-
       let settingsPerCulture = new Map<string, any>()
 
-      // here we do a while loop to make full use of qna tps capacity
-      while (mergedContents.length > 0) {
-        // get a number(set by qnaApiTps) of contents for each loop
-        const subContents = mergedContents.splice(0, qnaAPITPS)
-
-        // concurrently handle applications
-        await Promise.all(subContents.map(async content => {
-          let qnamakerContent = content.qnamakerContent
-          if (!fileHelper.isFileSectionEmpty(qnamakerContent)) {
-            let currentQna = content.qnamakerObject
-            
-            // set kb name
-            if (!currentQna.kb.name) currentQna.kb.name = `${botName}(${suffix}).${qnamakerContent.language}.qna`
-
-            let currentKB = currentQna.kb
-            let currentAlt = currentQna.alterations
-            let hostName = ''
-            let kbId = ''
-
-            // find if there is a matched name with current kb under current key 
-            for (let kb of kbs) {
-              if (kb.name === currentKB.name) {
-                kbId = kb.id
-                hostName = kb.hostName
-                break
+      try {
+        const qnaBuildCore = new QnaBuildCore(subscriptionkey, endpoint)
+        const kbs = (await qnaBuildCore.getKBList()).knowledgebases
+
+        // here we do a while loop to make full use of qna tps capacity
+        while (mergedContents.length > 0) {
+          // get a number(set by qnaApiTps) of contents for each loop
+          const subContents = mergedContents.splice(0, qnaAPITPS)
+
+          // concurrently handle applications
+          await Promise.all(subContents.map(async content => {
+            let qnamakerContent = content.qnamakerContent
+            if (!fileHelper.isFileSectionEmpty(qnamakerContent)) {
+              let currentQna = content.qnamakerObject
+
+              // set kb name
+              if (!currentQna.kb.name) currentQna.kb.name = `${botName}(${suffix}).${qnamakerContent.language}.qna`
+
+              let currentKB = currentQna.kb
+              let currentAlt = currentQna.alterations
+              let hostName = ''
+              let kbId = ''
+
+              // find if there is a matched name with current kb under current key 
+              for (let kb of kbs) {
+                if (kb.name === currentKB.name) {
+                  kbId = kb.id
+                  hostName = kb.hostName
+                  break
+                }
               }
-            }
 
-            let needPublish = false
-
-            // compare models to update the model if a match found
-            // otherwise create a new kb
-            if (kbId !== '') {
-              // To see if need update the model
-              needPublish = await this.updateKB(currentKB, qnaBuildCore, kbId, timeBucketOfRequests)
-            } else {
-              // create a new kb
-              kbId = await this.createKB(currentKB, qnaBuildCore, timeBucketOfRequests)
-              needPublish = true
-            }
+              let needPublish = false
+
+              // compare models to update the model if a match found
+              // otherwise create a new kb
+              if (kbId !== '') {
+                // To see if need update the model
+                needPublish = await this.updateKB(currentKB, qnaBuildCore, kbId, timeBucketOfRequests)
+              } else {
+                // create a new kb
+                kbId = await this.createKB(currentKB, qnaBuildCore, timeBucketOfRequests)
+                needPublish = true
+              }
 
-            if (needPublish) {
-              // train and publish kb
-              await this.publishKB(qnaBuildCore, kbId, currentKB.name, timeBucketOfRequests)
-            }
+              if (needPublish) {
+                // train and publish kb
+                await this.publishKB(qnaBuildCore, kbId, currentKB.name, timeBucketOfRequests)
+              }
 
-            if (hostName === '') hostName = (await qnaBuildCore.getKB(kbId)).hostName
+              if (hostName === '') hostName = (await qnaBuildCore.getKB(kbId)).hostName
 
-            hostName += '/qnamaker'
+              hostName += '/qnamaker'
 
-            // update alterations if there are
-            if (currentAlt.wordAlterations && currentAlt.wordAlterations.length > 0) {
-              this.handler('Replacing alterations...\n')
-              await qnaBuildCore.replaceAlt(currentAlt)
-            }
+              // update alterations if there are
+              if (currentAlt.wordAlterations && currentAlt.wordAlterations.length > 0) {
+                this.handler('Replacing alterations...\n')
+                await qnaBuildCore.replaceAlt(currentAlt)
+              }
 
-            settingsPerCulture.set(qnamakerContent.language, {
-              kbId,
-              hostName
-            })
-          }
-        }))
+              settingsPerCulture.set(qnamakerContent.language, {
+                kbId,
+                hostName
+              })
+            }
+          }))
+        }
+      } catch (error) {
+        throw(new exception(retCode.errorCode.QNAMAKER_BUILD_FAILED, `Qnamaker build failed: ${error.message}`))
       }
 
       let settings: any