Merge pull request #172 from microsoft/vishwac/newEntityAndFeatures

.lu file update - Ability to tie features to a specific model

Author: munozemilio

packages/luis/.gitignore

@@ -6,3 +6,4 @@
 /tmp
 /yarn.lock
 node_modules
+**/.antlr

packages/luis/src/parser/converters/luistoluconverter.js

@@ -98,9 +98,7 @@ module.exports = {
                     fileContent += NEWLINE + NEWLINE;
                 }
                 fileContent += `@ simple ${entity.name}`;
-                if (entity.roles.length > 0) {
-                    fileContent += ` ${entity.roles.length > 1 ? `hasRoles` : `hasRole`} ${entity.roles.join(',')}`
-                }
+                fileContent += addRolesAndFeatures(entity);
                 fileContent += NEWLINE + NEWLINE;
             });
             fileContent += NEWLINE;
@@ -110,9 +108,7 @@ module.exports = {
             fileContent += '> # PREBUILT Entity definitions' + NEWLINE + NEWLINE;
             LUISJSON.prebuiltEntities.forEach(function(entity) {
                 fileContent += `@ prebuilt ${entity.name}`;
-                if (entity.roles.length > 0) {
-                    fileContent += ` ${entity.roles.length > 1 ? `hasRoles` : `hasRole`} ${entity.roles.join(',')}`;
-                }
+                fileContent += addRolesAndFeatures(entity);
                 fileContent += NEWLINE + NEWLINE;
             });
             fileContent += NEWLINE;
@@ -122,7 +118,7 @@ module.exports = {
             fileContent += '> # Phrase list definitions' + NEWLINE + NEWLINE;
             LUISJSON.model_features.forEach(function(entity) {
                 fileContent += `@ phraselist ${entity.name}${(entity.mode ? `(interchangeable)` : ``)}`;
-                if (entity.words !== '') {
+                if (entity.words && entity.words !== '') {
                     fileContent += ` = ${NEWLINE}\t- ${entity.words}`;
                 }
                 fileContent += NEWLINE + NEWLINE;
@@ -133,9 +129,7 @@ module.exports = {
             fileContent += '> # List entities' + NEWLINE + NEWLINE;
             LUISJSON.closedLists.forEach(function(ListItem) {
                 fileContent += `@ list ${ListItem.name}`;
-                if (ListItem.roles.length > 0) {
-                    fileContent += ` ${ListItem.roles.length > 1 ? `hasRoles` : `hasRole`} ${ListItem.roles.join(',')}`;
-                }
+                fileContent += addRolesAndFeatures(ListItem);
                 if (ListItem.subLists.length !== 0) {
                     fileContent += ` = `;
                     fileContent += NEWLINE;
@@ -155,9 +149,7 @@ module.exports = {
             fileContent += '> # RegEx entities' + NEWLINE + NEWLINE; 
             LUISJSON.regex_entities.forEach(function(regExEntity) {
                 fileContent += `@ regex ${regExEntity.name}`;
-                if (regExEntity.roles.length > 0) {
-                    fileContent += ` ${regExEntity.roles.length > 1 ? `hasRoles` : `hasRole`} ${regExEntity.roles.join(',')}`;
-                }
+                fileContent += addRolesAndFeatures(regExEntity);
                 if (regExEntity.regexPattern !== '') {
                     fileContent += ` = /${regExEntity.regexPattern}/`;
                 }
@@ -171,9 +163,7 @@ module.exports = {
             fileContent += '> # Composite entities' + NEWLINE + NEWLINE; 
             LUISJSON.composites.forEach(composite => {
                 fileContent += `@ composite ${composite.name}`;
-                if (composite.roles.length > 0) {
-                    fileContent += ` ${composite.roles.length > 1 ? `hasRoles` : `hasRole`} ${composite.roles.join(',')}`;
-                }
+                fileContent += addRolesAndFeatures(composite);
                 if (composite.children.length > 0) {
                     fileContent += ` = [${composite.children.join(', ')}]`;
                 }
@@ -184,6 +174,28 @@ module.exports = {
     }
 }
 
+/**
+ * Helper to construt role and features list for an entity
+ * @param {Object} entity 
+ * @returns {String} file content to include.
+ */
+const addRolesAndFeatures = function(entity) {
+    let roleAndFeatureContent = ''
+    if (entity.roles && entity.roles.length > 0) {
+        roleAndFeatureContent += ` ${entity.roles.length > 1 ? `hasRoles` : `hasRole`} ${entity.roles.join(',')}`;
+    }
+    if (entity.features && entity.features.length > 0) {
+        let featuresList = new Array();
+        entity.features.forEach(item => {
+            if (item.featureName) featuresList.push(item.featureName);
+            if (item.modelName) featuresList.push(item.modelName);
+        })
+        roleAndFeatureContent += ` ${featuresList.length > 1 ? `usesFeatures` : `usesFeature`} ${featuresList.join(',')}`;
+    }
+
+    return roleAndFeatureContent
+}
+
 const parseLuis = async function(luisObject, src, sort){
     let LUISJSON = new helperClasses.readerObject()
     LUISJSON.model = await luisFile.parseLuisJson(luisObject)

packages/luis/src/parser/lufile/LUFileLexer.g4

@@ -100,7 +100,7 @@ HAS_FEATURES_LABEL
   ;
 
 NEW_ENTITY_TYPE_IDENTIFIER
-  : 'simple'|'list'|'regex'|'prebuilt'|'composite'|'machine-learned'|'patternany'|'phraselist'
+  : 'simple'|'list'|'regex'|'prebuilt'|'composite'|'machine-learned'|'patternany'|'phraselist'|'intent'
   ;
 
 NEW_ENTITY_IDENTIFIER

packages/luis/src/parser/lufile/classes/hclasses.js

@@ -130,6 +130,11 @@ const readerObj = {
         hasRole(value) {
             return this.roles.includes(value);
         }
+    },
+    intentFeature: class {
+        constructor(name) {
+            this.featureName = name ? name : '';
+        }
     }
 };
 

packages/luis/src/parser/lufile/enums/luisEntityTypeNameMap.js

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+module.exports = {
+    'simple': 'entities',
+    'prebuilt': 'prebuiltEntities',
+    'list': 'closedLists',
+    'regex': 'regex_entities',
+    'composite': 'composites',
+    'machine-learned': 'entities',
+    'patternany':'patternAnyEntities',
+    'phraselist': 'model_features'
+};