Fix max features numbers validation issue (#1131)

* fix max number of features issue

* add test cases to test the features boundary

Author: feich-ms

packages/lu/src/parser/luis/luisValidator.js

@@ -146,8 +146,12 @@ const validateBoundaries = function(luisJSON) {
     // features - Maximum number of models that can be used as a descriptor (feature) to a specific model to be 10 models.
     ["intents", "entities"].forEach(scope => {
         luisJSON[scope].forEach(item => {
-            if (item.features && item.features.length > retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL) {
-                validationError(retCode.errorCode.BOUNDARY_FEATURE_PER_MODEL, `${scope.substring(0, scope.length - 1)} ${item.name} has ${item.features.length} descriptors (feature). At most ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL} is allowed.`)
+            if (item.features && item.features.filter(f => f.modelName).length > retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL) {
+                validationError(retCode.errorCode.BOUNDARY_FEATURE_PER_MODEL, `${scope.substring(0, scope.length - 1)} ${item.name} has ${item.features.filter(f => f.modelName).length} model descriptors (feature). At most ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL} is allowed.`)
+            }
+
+            if (item.features && item.features.filter(f => f.featureName).length > retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL) {
+                validationError(retCode.errorCode.BOUNDARY_FEATURE_PER_MODEL, `${scope.substring(0, scope.length - 1)} ${item.name} has ${item.features.filter(f => f.featureName).length} phraselist descriptors (feature). At most ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL} is allowed.`)
             }
         })
     })

packages/lu/test/parser/lufile/luis.boundary.test.js

@@ -151,16 +151,38 @@ describe('Validations for LU content (based on LUIS boundaries)', function () {
             })
     })
 
-    it (`At most ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL} descriptors per model`, function(done) {
+    it (`At most ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL} model descriptors per model`, function(done) {
         LuisBuilder.fromLUAsync(new Array(new luObj(getEntityWithFeatures())))
             .then(res => done(res))
             .catch(err => {
                 assert.equal(err.errCode, retCode.errorCode.BOUNDARY_FEATURE_PER_MODEL);
-                assert(err.text.includes(`At most ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL} is allowed.`));
+                assert(err.text.includes(`has ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL + 1} model descriptors (feature). At most ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL} is allowed.`));
                 done();
             })
     })
 
+    it (`At most ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL} phraselist descriptors per model`, function(done) {
+        
+        LuisBuilder.fromLUAsync(new Array(new luObj(getEntityWithFeatures(-1, retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL))))
+            .then(res => done(res))
+            .catch(err => {
+                assert.equal(err.errCode, retCode.errorCode.BOUNDARY_FEATURE_PER_MODEL);
+                assert(err.text.includes(`has ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL + 1} phraselist descriptors (feature). At most ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL} is allowed.`));
+                done();
+            })
+    })
+
+    it (`At most ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL} model descriptors and ${retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL} phraselist descriptors per model(total 20)`, function(done) {
+        
+        LuisBuilder.fromLUAsync(new Array(new luObj(getEntityWithFeatures(retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL - 1, retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL - 1))))
+            .then(res => {
+                assert.equal(res.entities.length, retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL + 1);
+                assert.equal(res.entities[10].name, 'testEntity');
+                assert.equal(res.entities[10].features.length, retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL * 2);
+                done()
+            }).catch(err => done(err))
+    })
+
     it (`At most ${retCode.boundaryLimits.MAX_NUM_PARENT_ENTITIES} parent nodes in an ML entitiy`, function(done) {
         LuisBuilder.fromLUAsync(new Array(new luObj(getMLEntity())))
             .then(res => done(res))
@@ -242,15 +264,23 @@ const getMLEntity = function() {
     }
     return fc;
 }
-const getEntityWithFeatures = function() {
+const getEntityWithFeatures = function(numModelFeatures = retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL, numberPhraselistFeatures = -1) {
     let fc = '';
     let descriptorsList = [];
-    for (var i = 0; i <= retCode.boundaryLimits.MAX_NUM_DESCRIPTORS_PER_MODEL; i++) {
+    for (var i = 0; i <= numModelFeatures; i++) {
         let newEntityName = `entity${i}`;
         descriptorsList.push(newEntityName);
         fc += `
 @ ml ${newEntityName}`;
     }
+
+    for (var i = 0; i <= numberPhraselistFeatures; i++) {
+        descriptorsList.push(`PL${i}`);
+        fc += `
+@ phraselist PL${i} =
+    - phrase,phrase-last`;
+    }
+
     fc += `
 @ ml testEntity usesFeatures ${descriptorsList.join(',')}
 `;