add id for recognizer and multiLang recognizer of both luis and qnamaker build (#858)

feich-ms · vishwacsena · web-flow · commit 87e42ae1f872 · 2020-06-18T13:31:19.000+08:00
Co-authored-by: Vishwac Sena Kannan &lt;vishwack@hotmail.com&gt;
diff --git a/packages/lu/src/parser/lubuild/multi-language-recognizer.ts b/packages/lu/src/parser/lubuild/multi-language-recognizer.ts
@@ -3,12 +3,16 @@
  * Licensed under the MIT License.
  */
 
+const path = require('path')
+
 export class MultiLanguageRecognizer {
   public recognizers: any
+  private readonly id: string
   private readonly dialogPath: string
   private readonly $schema: string | undefined
 
   constructor(dialogPath: string, recognizers: any, schema?: string) {
+    this.id = `LUIS_${path.basename(dialogPath).split('.')[0]}`
     this.dialogPath = dialogPath
     this.recognizers = recognizers
     this.$schema = schema
@@ -17,6 +21,7 @@ export class MultiLanguageRecognizer {
   save(): string {
     let output: any = {
       $kind: 'Microsoft.MultiLanguageRecognizer',
+      id: this.id,
       recognizers: this.recognizers
     }
 
diff --git a/packages/lu/src/parser/lubuild/recognizer.ts b/packages/lu/src/parser/lubuild/recognizer.ts
@@ -24,6 +24,7 @@ export class Recognizer {
   }
 
   versionId: string
+  private readonly id: string
   private readonly applicationId: string | undefined
   private readonly endpoint: string | undefined
   private readonly endpointKey: string | undefined
@@ -33,6 +34,7 @@ export class Recognizer {
 
   constructor(private readonly luFile: string, targetFileName: string, schema?: string) {
     this.appId = ''
+    this.id = `LUIS_${targetFileName.split('.')[0]}`
     this.applicationId = `=settings.luis.${targetFileName.split('.').join('_').replace(/-/g, '_')}`
     this.endpoint = '=settings.luis.endpoint'
     this.endpointKey = '=settings.luis.endpointKey'
@@ -43,6 +45,7 @@ export class Recognizer {
   save(): string {
     let output: any = {
       $kind: 'Microsoft.LuisRecognizer',
+      id: this.id,
       applicationId: this.applicationId,
       endpoint: this.endpoint,
       endpointKey: this.endpointKey
diff --git a/packages/lu/src/parser/qnabuild/multi-language-recognizer.ts b/packages/lu/src/parser/qnabuild/multi-language-recognizer.ts
@@ -3,12 +3,16 @@
  * Licensed under the MIT License.
  */
 
+const path = require('path')
+
 export class MultiLanguageRecognizer {
   public recognizers: any
+  private readonly id: string
   private readonly dialogPath: string
   private readonly $schema: string | undefined
 
   constructor(dialogPath: string, recognizers: any, schema?: string) {
+    this.id = `QnA_${path.basename(dialogPath).split('.')[0]}`
     this.dialogPath = dialogPath
     this.recognizers = recognizers
     this.$schema = schema
@@ -17,6 +21,7 @@ export class MultiLanguageRecognizer {
   save(): string {
     let output: any = {
       $kind: 'Microsoft.MultiLanguageRecognizer',
+      id: this.id,
       recognizers: this.recognizers
     }
 
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.en-us.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.en-us.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
+    "id": "LUIS_foo",
     "applicationId": "=settings.luis.foo_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.fr-fr.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.fr-fr.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
+    "id": "LUIS_foo",
     "applicationId": "=settings.luis.foo_fr_fr_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.MultiLanguageRecognizer",
+    "id": "LUIS_foo",
     "recognizers": {
         "fr-fr": "foo.fr-fr.lu",
         "en-us": "foo.en-us.lu",
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.zh-cn.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.zh-cn.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
+    "id": "LUIS_foo",
     "applicationId": "=settings.luis.foo_zh_cn_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo2/dialogs/foo.en-us.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo2/dialogs/foo.en-us.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
+    "id": "LUIS_foo",
     "applicationId": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
     "endpointKey": "zzz"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo2/dialogs/foo.fr-fr.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo2/dialogs/foo.fr-fr.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
+    "id": "LUIS_foo",
     "applicationId": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
     "endpointKey": "zzz"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo2/dialogs/foo.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo2/dialogs/foo.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.MultiLanguageRecognizer",
+    "id": "LUIS_foo",
     "recognizers": {
         "en-us": "foo.en-us.lu",
         "": "foo.en-us.lu",
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo2/dialogs/foo.zh-cn.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo2/dialogs/foo.zh-cn.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
+    "id": "LUIS_foo",
     "applicationId": "=settings.luis.foo_zh_cn_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo2/lufiles-and-dialog-assets/foo.en-us.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo2/lufiles-and-dialog-assets/foo.en-us.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
+    "id": "LUIS_foo",
     "applicationId": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
     "endpointKey": "zzz"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo2/lufiles-and-dialog-assets/foo.fr-fr.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo2/lufiles-and-dialog-assets/foo.fr-fr.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
+    "id": "LUIS_foo",
     "applicationId": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
     "endpointKey": "zzz"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo2/lufiles-and-dialog-assets/foo.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo2/lufiles-and-dialog-assets/foo.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.MultiLanguageRecognizer",
+    "id": "LUIS_foo",
     "recognizers": {
         "en-us": "foo.en-us.lu",
         "": "foo.en-us.lu",
diff --git a/packages/luis/test/fixtures/testcases/lubuild/luconfig/dialogs/test.en-us.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/luconfig/dialogs/test.en-us.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
+    "id": "LUIS_test",
     "applicationId": "=settings.luis.test_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/luconfig/dialogs/test.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/luconfig/dialogs/test.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.MultiLanguageRecognizer",
+    "id": "LUIS_test",
     "recognizers": {
         "en-us": "test.en-us.lu",
         "": "test.en-us.lu"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/sandwich/dialogs-with-schema/sandwich.en-us.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/sandwich/dialogs-with-schema/sandwich.en-us.lu.dialog
@@ -1,6 +1,7 @@
 {
     "$schema": "https://raw.githubusercontent.com/microsoft/BotFramework-Composer/stable/Composer/packages/server/schemas/sdk.schema",
     "$kind": "Microsoft.LuisRecognizer",
+    "id": "LUIS_sandwich",
     "applicationId": "=settings.luis.sandwich_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/sandwich/dialogs-with-schema/sandwich.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/sandwich/dialogs-with-schema/sandwich.lu.dialog
@@ -1,6 +1,7 @@
 {
     "$schema": "https://raw.githubusercontent.com/microsoft/BotFramework-Composer/stable/Composer/packages/server/schemas/sdk.schema",
     "$kind": "Microsoft.MultiLanguageRecognizer",
+    "id": "LUIS_sandwich",
     "recognizers": {
         "en-us": "sandwich.en-us.lu",
         "": "sandwich.en-us.lu"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/sandwich/dialogs/sandwich.en-us.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/sandwich/dialogs/sandwich.en-us.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
+    "id": "LUIS_sandwich",
     "applicationId": "=settings.luis.sandwich_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
diff --git a/packages/luis/test/fixtures/testcases/lubuild/sandwich/dialogs/sandwich.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/sandwich/dialogs/sandwich.lu.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.MultiLanguageRecognizer",
+    "id": "LUIS_sandwich",
     "recognizers": {
         "en-us": "sandwich.en-us.lu",
         "": "sandwich.en-us.lu"
diff --git a/packages/qnamaker/test/fixtures/testcases/qnabuild/multi-locales/dialogs/test.qna.dialog b/packages/qnamaker/test/fixtures/testcases/qnabuild/multi-locales/dialogs/test.qna.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.MultiLanguageRecognizer",
+    "id": "QnA_test",
     "recognizers": {
         "en-us": "test.en-us.qna",
         "": "test.en-us.qna",
diff --git a/packages/qnamaker/test/fixtures/testcases/qnabuild/sandwich/dialogs-with-schema/test.qna.dialog b/packages/qnamaker/test/fixtures/testcases/qnabuild/sandwich/dialogs-with-schema/test.qna.dialog
@@ -1,6 +1,7 @@
 {
     "$schema": "https://raw.githubusercontent.com/microsoft/BotFramework-Composer/stable/Composer/packages/server/schemas/sdk.schema",
     "$kind": "Microsoft.MultiLanguageRecognizer",
+    "id": "QnA_test",
     "recognizers": {
         "en-us": "test.en-us.qna",
         "": "test.en-us.qna"
diff --git a/packages/qnamaker/test/fixtures/testcases/qnabuild/sandwich/dialogs/test.qna.dialog b/packages/qnamaker/test/fixtures/testcases/qnabuild/sandwich/dialogs/test.qna.dialog
@@ -1,5 +1,6 @@
 {
     "$kind": "Microsoft.MultiLanguageRecognizer",
+    "id": "QnA_test",
     "recognizers": {
         "en-us": "test.en-us.qna",
         "": "test.en-us.qna"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$kind": "Microsoft.LuisRecognizer",`
	`3`	`+ "id": "LUIS_foo",`
`3`	`4`	`"applicationId": "=settings.luis.foo_en_us_lu",`
`4`	`5`	`"endpoint": "=settings.luis.endpoint",`
`5`	`6`	`"endpointKey": "=settings.luis.endpointKey"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$kind": "Microsoft.MultiLanguageRecognizer",`
	`3`	`+ "id": "LUIS_foo",`
`3`	`4`	`"recognizers": {`
`4`	`5`	`"fr-fr": "foo.fr-fr.lu",`
`5`	`6`	`"en-us": "foo.en-us.lu",`