Support extracting more modelTypeId in luis:test command (#1229)

* support all modelTypeId

* change valid modelTypeId

* modify test

* retrigger

Author: Shuai Wang

packages/lu/src/parser/test/testhelper.ts

@@ -89,7 +89,7 @@ function compareEntity(predictedEntities: any[], utterance: any) {
   let pass = true
   for (const entity of utterance.entities) {
     if (!predictedEntities.find((x: any) =>
-      (entity.role !== undefined && entity.role === x.role || entity.role === undefined && entity.entity === x.entity)
+      ((entity.role !== undefined && entity.role === x.role) || (entity.role === undefined && entity.entity === x.entity))
       && entity.startPos === x.startPos
       && entity.endPos === x.endPos)) {
       pass = false
@@ -105,7 +105,7 @@ function ParseEntitiyResult(entities: any, result: any) {
     if (name === '$instance') {
       for (const entityType of Object.keys(entities.$instance)) {
         for (const entity of entities.$instance[entityType]) {
-          if (entity.modelTypeId === 1 || entity.modelTypeId === 4 || (entity.role !== undefined && entity.role !== '')) {
+          if (entity.modelTypeId === 1 || entity.modelTypeId === 4 || entity.modelTypeId === 10 || entity.role) {
             let newEntity: any = new Object()
             newEntity.entity = entityType
             newEntity.startPos = entity.startIndex

packages/luis/test/commands/luis/test.test.ts

@@ -282,7 +282,7 @@ describe('luis:test normal test', () => {
     nock('https://westus.api.cognitive.microsoft.com')
     .post(uri => uri.includes('apps'))
     .reply(200, {
-      "query":"create a event with eden roth at 4pm today for 30 mins","prediction":{"topIntent":"CreateCalendarEntry","intents":{"CreateCalendarEntry":{"score":0.9999999},"None":{"score":4.94949234e-7},"FindCalendarEntry":{"score":4.29645354e-7},"AcceptEventEntry":{"score":3.24675227e-7}},"entities":{"FromTime":["4pm"],"FromDate":["today"],"Duration":["30 mins"],"$instance":{"FromTime":[{"type":"FromTime","text":"4pm","startIndex":33,"length":3,"score":0.9858761,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"FromDate":[{"type":"FromDate","text":"today","startIndex":37,"length":5,"score":0.9848769,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"Duration":[{"type":"Duration","text":"30 mins","startIndex":47,"length":7,"score":0.978632748,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}}
+      "query":"create a event with eden roth at 4pm today for 30 mins","prediction":{"topIntent":"CreateCalendarEntry","intents":{"CreateCalendarEntry":{"score":0.9999999},"None":{"score":4.94949234e-7},"FindCalendarEntry":{"score":4.29645354e-7},"AcceptEventEntry":{"score":3.24675227e-7}},"entities":{"FromTime":["4pm"],"FromDate":["today"],"Duration":["30 mins"],"$instance":{"FromTime":[{"type":"FromTime","text":"4pm","startIndex":33,"length":3,"score":0.9858761,"modelTypeId":10,"modelType":"Entity Extractor","recognitionSources":["model"]}],"FromDate":[{"type":"FromDate","text":"today","startIndex":37,"length":5,"score":0.9848769,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"Duration":[{"type":"Duration","text":"30 mins","startIndex":47,"length":7,"score":0.978632748,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}}
     })
 
     nock('https://westus.api.cognitive.microsoft.com')