[4.9] luis:build remove prediction options being written out (#771) (#773)

munozemilio · vishwacsena · Vishwac Sena Kannan · web-flow · commit bd26487daf05 · 2020-05-08T12:06:43.000-07:00
* [Master] luis:build remove prediction options being written out (#771) * Fix to remove prediction options * fix up tests Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@DESKTOP-LULCPNJ.corp.microsoft.com> * Bump RC version Co-authored-by: Vishwac Sena Kannan <vishwack@hotmail.com> Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@DESKTOP-LULCPNJ.corp.microsoft.com>
diff --git a/build/botframework-cli-mac.yml b/build/botframework-cli-mac.yml
@@ -28,7 +28,7 @@ pr:
 jobs:
   - job: CLI
     variables:
-      buildVersion: '4.9.0-RC5'
+      buildVersion: '4.9.0-RC6'
       _version: ${{coalesce(variables.version, variables.buildVersion)}}
 
     steps:
diff --git a/build/botframework-cli.yml b/build/botframework-cli.yml
@@ -28,7 +28,7 @@ pr:
 jobs:
   - job: CLI
     variables:
-      buildVersion: '4.9.0-RC5'
+      buildVersion: '4.9.0-RC6'
       _version: ${{coalesce(variables.version, variables.buildVersion)}}
 
     steps:
diff --git a/packages/lu/src/parser/lubuild/recognizer.ts b/packages/lu/src/parser/lubuild/recognizer.ts
@@ -27,8 +27,6 @@ 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
 
@@ -37,14 +35,6 @@ 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'
   }
 
@@ -53,8 +43,7 @@ export class Recognizer {
       $kind: 'Microsoft.LuisRecognizer',
       applicationId: this.applicationId,
       endpoint: this.endpoint,
-      endpointKey: this.endpointKey,
-      predictionOptions: this.predictionOptions
+      endpointKey: this.endpointKey
     }
 
     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,13 +2,5 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.foo_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
-    "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, '')"
-    }
+    "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
@@ -2,13 +2,5 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.foo_fr_fr_lu",
     "endpoint": "=settings.luis.endpoint",
-    "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, '')"
-    }
+    "endpointKey": "=settings.luis.endpointKey"
 }
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,13 +2,5 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.foo_zh_cn_lu",
     "endpoint": "=settings.luis.endpoint",
-    "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, '')"
-    }
+    "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
@@ -2,13 +2,5 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
-    "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, '')"
-    }
+    "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
@@ -2,13 +2,5 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
-    "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, '')"
-    }
+    "endpointKey": "zzz"
 }
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,13 +2,5 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.foo_zh_cn_lu",
     "endpoint": "=settings.luis.endpoint",
-    "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, '')"
-    }
+    "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
@@ -2,13 +2,5 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
-    "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, '')"
-    }
+    "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
@@ -2,13 +2,5 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
     "endpoint": "yyy",
-    "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, '')"
-    }
+    "endpointKey": "zzz"
 }
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,13 +2,5 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.test_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
-    "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, '')"
-    }
+    "endpointKey": "=settings.luis.endpointKey"
 }
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,13 +2,5 @@
     "$kind": "Microsoft.LuisRecognizer",
     "applicationId": "=settings.luis.sandwich_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
-    "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, '')"
-    }
+    "endpointKey": "=settings.luis.endpointKey"
 }
