write out prediction options (#709)

feich-ms · vishwacsena · web-flow · commit 873f6c8647eb · 2020-04-24T15:01:26.000-07:00
* write out prediction options

* add more configuration property

* optimize default vales

Co-authored-by: Vishwac Sena Kannan &lt;vishwack@hotmail.com&gt;
diff --git a/packages/lu/src/parser/lubuild/recognizer.ts b/packages/lu/src/parser/lubuild/recognizer.ts
@@ -27,6 +27,7 @@ export class Recognizer {
   readonly applicationId: string | undefined
   readonly endpoint: string | undefined
   readonly endpointKey: string | undefined
+  readonly predictionOptions: any
 
   private appId: string
   private dialogPath: string | undefined
@@ -36,6 +37,14 @@ export class Recognizer {
     this.applicationId = `=settings.luis.${targetFileName.split('.').join('_').replace(/-/g, '_')}`
     this.endpoint = '=settings.luis.endpoint'
     this.endpointKey = '=settings.luis.endpointKey'
+    this.predictionOptions = {
+      includeAllIntents: '=coalesce(settings.luis.preditionOptions.includeAllIntents, false)',
+      includeInstanceData: '=coalesce(settings.luis.preditionOptions.includeInstanceData, true)',
+      log: '=coalesce(settings.luis.preditionOptions.log, true)',
+      preferExternalEntities: '=coalesce(settings.luis.preditionOptions.preferExternalEntities, true)',
+      slot: "=coalesce(settings.luis.preditionOptions.slot, 'production')",
+      version: "=coalesce(settings.luis.preditionOptions.version, '')"
+    }
     this.versionId = '0.1'
   }
 
@@ -44,7 +53,8 @@ export class Recognizer {
       $kind: 'Microsoft.LuisRecognizer',
       applicationId: this.applicationId,
       endpoint: this.endpoint,
-      endpointKey: this.endpointKey
+      endpointKey: this.endpointKey,
+      predictionOptions: this.predictionOptions
     }
 
     return JSON.stringify(output, null, 4)
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
@@ -2,5 +2,13 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.foo_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
-    "endpointKey": "=settings.luis.endpointKey"
+    "endpointKey": "=settings.luis.endpointKey",
+    "predictionOptions": {
+        "includeAllIntents": "=coalesce(settings.luis.preditionOptions.includeAllIntents, false)",
+        "includeInstanceData": "=coalesce(settings.luis.preditionOptions.includeInstanceData, true)",
+        "log": "=coalesce(settings.luis.preditionOptions.log, true)",
+        "preferExternalEntities": "=coalesce(settings.luis.preditionOptions.preferExternalEntities, true)",
+        "slot": "=coalesce(settings.luis.preditionOptions.slot, 'production')",
+        "version": "=coalesce(settings.luis.preditionOptions.version, '')"
+    }
 }
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
@@ -2,5 +2,13 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.foo_fr_fr_lu",
     "endpoint": "=settings.luis.endpoint",
-    "endpointKey": "=settings.luis.endpointKey"
+    "endpointKey": "=settings.luis.endpointKey",
+    "predictionOptions": {
+        "includeAllIntents": "=coalesce(settings.luis.preditionOptions.includeAllIntents, false)",
+        "includeInstanceData": "=coalesce(settings.luis.preditionOptions.includeInstanceData, true)",
+        "log": "=coalesce(settings.luis.preditionOptions.log, true)",
+        "preferExternalEntities": "=coalesce(settings.luis.preditionOptions.preferExternalEntities, true)",
+        "slot": "=coalesce(settings.luis.preditionOptions.slot, 'production')",
+        "version": "=coalesce(settings.luis.preditionOptions.version, '')"
+    }
 }
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
@@ -2,5 +2,13 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.foo_zh_cn_lu",
     "endpoint": "=settings.luis.endpoint",
-    "endpointKey": "=settings.luis.endpointKey"
+    "endpointKey": "=settings.luis.endpointKey",
+    "predictionOptions": {
+        "includeAllIntents": "=coalesce(settings.luis.preditionOptions.includeAllIntents, false)",
+        "includeInstanceData": "=coalesce(settings.luis.preditionOptions.includeInstanceData, true)",
+        "log": "=coalesce(settings.luis.preditionOptions.log, true)",
+        "preferExternalEntities": "=coalesce(settings.luis.preditionOptions.preferExternalEntities, true)",
+        "slot": "=coalesce(settings.luis.preditionOptions.slot, 'production')",
+        "version": "=coalesce(settings.luis.preditionOptions.version, '')"
+    }
 }
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
@@ -2,5 +2,13 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
-    "endpointKey": "zzz"
+    "endpointKey": "zzz",
+    "predictionOptions": {
+        "includeAllIntents": "=coalesce(settings.luis.preditionOptions.includeAllIntents, false)",
+        "includeInstanceData": "=coalesce(settings.luis.preditionOptions.includeInstanceData, true)",
+        "log": "=coalesce(settings.luis.preditionOptions.log, true)",
+        "preferExternalEntities": "=coalesce(settings.luis.preditionOptions.preferExternalEntities, true)",
+        "slot": "=coalesce(settings.luis.preditionOptions.slot, 'production')",
+        "version": "=coalesce(settings.luis.preditionOptions.version, '')"
+    }
 }
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
@@ -2,5 +2,13 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
-    "endpointKey": "zzz"
+    "endpointKey": "zzz",
+    "predictionOptions": {
+        "includeAllIntents": "=coalesce(settings.luis.preditionOptions.includeAllIntents, false)",
+        "includeInstanceData": "=coalesce(settings.luis.preditionOptions.includeInstanceData, true)",
+        "log": "=coalesce(settings.luis.preditionOptions.log, true)",
+        "preferExternalEntities": "=coalesce(settings.luis.preditionOptions.preferExternalEntities, true)",
+        "slot": "=coalesce(settings.luis.preditionOptions.slot, 'production')",
+        "version": "=coalesce(settings.luis.preditionOptions.version, '')"
+    }
 }
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
@@ -2,5 +2,13 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.foo_zh_cn_lu",
     "endpoint": "=settings.luis.endpoint",
-    "endpointKey": "=settings.luis.endpointKey"
+    "endpointKey": "=settings.luis.endpointKey",
+    "predictionOptions": {
+        "includeAllIntents": "=coalesce(settings.luis.preditionOptions.includeAllIntents, false)",
+        "includeInstanceData": "=coalesce(settings.luis.preditionOptions.includeInstanceData, true)",
+        "log": "=coalesce(settings.luis.preditionOptions.log, true)",
+        "preferExternalEntities": "=coalesce(settings.luis.preditionOptions.preferExternalEntities, true)",
+        "slot": "=coalesce(settings.luis.preditionOptions.slot, 'production')",
+        "version": "=coalesce(settings.luis.preditionOptions.version, '')"
+    }
 }
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
@@ -2,5 +2,13 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
-    "endpointKey": "zzz"
+    "endpointKey": "zzz",
+    "predictionOptions": {
+        "includeAllIntents": "=coalesce(settings.luis.preditionOptions.includeAllIntents, false)",
+        "includeInstanceData": "=coalesce(settings.luis.preditionOptions.includeInstanceData, true)",
+        "log": "=coalesce(settings.luis.preditionOptions.log, true)",
+        "preferExternalEntities": "=coalesce(settings.luis.preditionOptions.preferExternalEntities, true)",
+        "slot": "=coalesce(settings.luis.preditionOptions.slot, 'production')",
+        "version": "=coalesce(settings.luis.preditionOptions.version, '')"
+    }
 }
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
@@ -2,5 +2,13 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
-    "endpointKey": "zzz"
+    "endpointKey": "zzz",
+    "predictionOptions": {
+        "includeAllIntents": "=coalesce(settings.luis.preditionOptions.includeAllIntents, false)",
+        "includeInstanceData": "=coalesce(settings.luis.preditionOptions.includeInstanceData, true)",
+        "log": "=coalesce(settings.luis.preditionOptions.log, true)",
+        "preferExternalEntities": "=coalesce(settings.luis.preditionOptions.preferExternalEntities, true)",
+        "slot": "=coalesce(settings.luis.preditionOptions.slot, 'production')",
+        "version": "=coalesce(settings.luis.preditionOptions.version, '')"
+    }
 }
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
@@ -2,5 +2,13 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.test_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
-    "endpointKey": "=settings.luis.endpointKey"
+    "endpointKey": "=settings.luis.endpointKey",
+    "predictionOptions": {
+        "includeAllIntents": "=coalesce(settings.luis.preditionOptions.includeAllIntents, false)",
+        "includeInstanceData": "=coalesce(settings.luis.preditionOptions.includeInstanceData, true)",
+        "log": "=coalesce(settings.luis.preditionOptions.log, true)",
+        "preferExternalEntities": "=coalesce(settings.luis.preditionOptions.preferExternalEntities, true)",
+        "slot": "=coalesce(settings.luis.preditionOptions.slot, 'production')",
+        "version": "=coalesce(settings.luis.preditionOptions.version, '')"
+    }
 }
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
@@ -2,5 +2,13 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.sandwich_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
-    "endpointKey": "=settings.luis.endpointKey"
+    "endpointKey": "=settings.luis.endpointKey",
+    "predictionOptions": {
+        "includeAllIntents": "=coalesce(settings.luis.preditionOptions.includeAllIntents, false)",
+        "includeInstanceData": "=coalesce(settings.luis.preditionOptions.includeInstanceData, true)",
+        "log": "=coalesce(settings.luis.preditionOptions.log, true)",
+        "preferExternalEntities": "=coalesce(settings.luis.preditionOptions.preferExternalEntities, true)",
+        "slot": "=coalesce(settings.luis.preditionOptions.slot, 'production')",
+        "version": "=coalesce(settings.luis.preditionOptions.version, '')"
+    }
 }
