Merge pull request #197 from microsoft/vishwac/5.0.0

Update luis schema version to v5 based on content

Author: munozemilio

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

@@ -25,6 +25,7 @@ module.exports = {
             if (haveLUISContent(finalLUISJSON)) {
                 await luisJSON.validateLUISBlob(finalLUISJSON)
             }
+            checkAndUpdateVersion(finalLUISJSON)
             return finalLUISJSON
         } catch (err) {
             throw(err)
@@ -250,7 +251,31 @@ const mergeResults_closedlists = function (blob, finalCollection, type) {
         });
     }
 }
-
+/**
+ * Helper to detect luis schema version based on content and update the final payload as needed.
+ * @param {LUIS} finalLUISJSON 
+ */
+const checkAndUpdateVersion = function(finalLUISJSON) {
+    // Detect if there is content specific to 5.0.0 schema
+    // any entity with children
+    let v5DefFound = false;
+    v5DefFound = (finalLUISJSON.entities || []).find(i => i.children || i.features) ||
+                 (finalLUISJSON.intents || []).find(i => i.features) || 
+                 (finalLUISJSON.composites || []).find(i => i.features);
+    if (v5DefFound) {
+        finalLUISJSON.luis_schema_version = "5.0.0";
+        if (finalLUISJSON.model_features && finalLUISJSON.model_features.length !== 0) {
+            finalLUISJSON.phraselists = [];
+            finalLUISJSON.model_features.forEach(item => finalLUISJSON.phraselists.push(Object.assign({}, item)));
+            delete finalLUISJSON.model_features;
+        }
+        (finalLUISJSON.composites || []).forEach(composite => {
+            let children = composite.children;
+            composite.children = [];
+            children.forEach(c => composite.children.push({name : c}));
+        })
+    }
+}
 /**
  * Helper function to see if we have any luis content in the blob
  * @param {object} blob Contents of parsed luis blob

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

@@ -366,6 +366,15 @@ describe('luis:convert', () => {
     })
 })   
 
+describe('luis:convert version 5 upgrade test', () => {
+  test
+  .stdout()
+  .command(['luis:convert', '--in', `${path.join(__dirname, './../../fixtures/verified/v5UpgradeTest.lu')}`, '--out', 'root.json'])
+  .it('luis:convert successfully reconstructs a markdown file from a LUIS input file with out of order entity references', async () => {
+    expect(await compareLuFiles('./../../../root.json', './../../fixtures/verified/v5Upgrade.json')).to.be.true
+  })
+})
+
 describe('luis:convert negative tests', () => {
   test
   .stderr()

packages/luis/test/fixtures/verified/v5Upgrade.json

@@ -0,0 +1,53 @@
+{
+  "intents": [],
+  "entities": [
+    {
+      "name": "xyz1",
+      "roles": [],
+      "children": [
+        {
+          "name": "xyz",
+          "instanceOf": "",
+          "children": [],
+          "features": ""
+        }
+      ]
+    }
+  ],
+  "composites": [
+    {
+      "name": "1",
+      "children": [
+        {
+          "name": "number"
+        }
+      ],
+      "roles": []
+    }
+  ],
+  "closedLists": [],
+  "regex_entities": [],
+  "regex_features": [],
+  "utterances": [],
+  "patterns": [],
+  "patternAnyEntities": [],
+  "prebuiltEntities": [
+    {
+      "name": "number",
+      "roles": []
+    }
+  ],
+  "luis_schema_version": "5.0.0",
+  "phraselists": [
+    {
+      "name": "abc",
+      "words": "one,two,three",
+      "mode": false,
+      "activated": true
+    }
+  ],
+  "versionId": "0.1",
+  "name": "",
+  "desc": "",
+  "culture": "en-us"
+}

packages/luis/test/fixtures/verified/v5UpgradeTest.lu

@@ -0,0 +1,8 @@
+@ml xyz1 = 
+    - @ ml xyz
+@ phraselist abc = 
+    - one
+    - two
+    - three
+@ prebuilt number
+@ composite 1 = [number]