optimzie cross train to care only trigger intents and allow empty trigger intent or dialog (#706)

Author: feich-ms

packages/lu/src/parser/cross-train/crossTrainer.js

@@ -95,10 +95,10 @@ const constructResoureTree = function (fileIdToLuResourceMap, triggerRules) {
 
     const destLuFileToIntent = triggerRules[fileId]
     for (const destLuFile of Object.keys(destLuFileToIntent)) {
-      if (!fileIdsFromInput.includes(destLuFile)) continue
+      if (destLuFile !== '' && !fileIdsFromInput.includes(destLuFile)) continue
 
       const triggerIntentName = destLuFileToIntent[destLuFile]
-      if (!intents.some(i => i.Name === triggerIntentName)) {
+      if (triggerIntentName !== '' && !intents.some(i => i.Name === triggerIntentName)) {
         throw (new exception(retCode.errorCode.INVALID_INPUT, `Sorry, trigger intent '${triggerIntentName}' is not found in lu file: ${fileId}`))
       }
 
@@ -144,7 +144,7 @@ const mergeRootInterruptionToLeaves = function (rootResource, result, qnaFileToR
   mergeBrothersInterruption(rootResource, result, intentName)
   for (const child of rootResource.children) {
     let childResource = result.get(child.target)
-    if (childResource.visited === undefined) {
+    if (childResource && childResource.visited === undefined) {
       const rootQnaFileId = rootResource.id.replace(new RegExp(helpers.FileExtTypeEnum.LUFile + '$'), helpers.FileExtTypeEnum.QnAFile)
       const rootQnaResource = qnaFileToResourceMap.get(rootQnaFileId)
       const newChildResource = mergeFatherInterruptionToChild(rootResource, rootQnaResource, childResource, intentName)
@@ -161,7 +161,8 @@ const mergeBrothersInterruption = function (resource, result, intentName) {
     let triggerIntent = child.intent
     const brotherSections = resource.content.Sections.filter(s => s.Name !== triggerIntent
       && s.Name !== intentName
-      && (s.SectionType === LUSectionTypes.SIMPLEINTENTSECTION || s.SectionType === LUSectionTypes.NESTEDINTENTSECTION))
+      && (s.SectionType === LUSectionTypes.SIMPLEINTENTSECTION || s.SectionType === LUSectionTypes.NESTEDINTENTSECTION)
+      && children.some(brotherChild => brotherChild.intent === s.Name))
 
     let brotherUtterances = []
     brotherSections.forEach(s => {
@@ -177,8 +178,10 @@ const mergeBrothersInterruption = function (resource, result, intentName) {
     let targetResource = result.get(child.target)
 
     // Merge direct brother's utterances
-    targetResource = mergeInterruptionIntent(brotherUtterances, targetResource, intentName)
-    result.set(targetResource.id, targetResource)
+    if (targetResource) {
+      targetResource = mergeInterruptionIntent(brotherUtterances, targetResource, intentName)
+      result.set(targetResource.id, targetResource)
+    }
   }
 }
 

packages/lu/test/parser/cross-train/crossTrainer.test.js

@@ -242,12 +242,11 @@ describe('luis:cross training tests among lu and qna contents', () => {
     assert.equal(luResult.get('dia1.fr-fr.lu').Sections[2].Name, '_Interruption')
     assert.equal(luResult.get('dia1.fr-fr.lu').Sections[2].Body, `- guide de l'utilisateur${NEWLINE}${NEWLINE}> Source: cross training. Please do not edit these directly!`)
     assert.equal(luResult.get('dia1.fr-fr.lu').Sections[3].Name, 'DeferToRecognizer_QnA_dia1')
-    assert.equal(luResult.get('dia1.fr-fr.lu').Sections[3].Body, `- raconter la blague`)
+    assert.equal(luResult.get('dia1.fr-fr.lu').Sections[3].Body, '- raconter la blague')
 
     assert.equal(qnaResult.get('dia1.fr-fr.qna').Sections[1].Questions.join(', '), 'J\'ai besoin d\'un hôtel quatre étoiles, puis-je réserver un hôtel près de l\'aiguille spatiale, guide de l\'utilisateur')
   })
 
-
   it('luis:cross training can get expected result when nestedIntentSection is enabled', () => {
     let luContentArray = []
 
@@ -297,7 +296,7 @@ describe('luis:cross training tests among lu and qna contents', () => {
     const luResult = trainedResult.luResult
 
     assert.equal(luResult.get('./dia2/dia2.lu').Sections[1].Name, '_Interruption')
-    assert.equal(luResult.get('./dia2/dia2.lu').Sections[1].Body, `- book a flight for me`)
+    assert.equal(luResult.get('./dia2/dia2.lu').Sections[1].Body, '- book a flight for me')
   })
 
   it('luis:cross training can get expected result when multiple dialog invocations occur in same trigger', () => {
@@ -353,12 +352,134 @@ describe('luis:cross training tests among lu and qna contents', () => {
     const luResult = trainedResult.luResult
 
     assert.equal(luResult.get('./dia1/dia1.lu').Sections[1].Name, '_Interruption')
-    assert.equal(luResult.get('./dia1/dia1.lu').Sections[1].Body, `- book a hotel for me`)
+    assert.equal(luResult.get('./dia1/dia1.lu').Sections[1].Body, '- book a hotel for me')
+
+    assert.equal(luResult.get('./dia2/dia2.lu').Sections[1].Name, '_Interruption')
+    assert.equal(luResult.get('./dia2/dia2.lu').Sections[1].Body, '- book a hotel for me')
+
+    assert.equal(luResult.get('./dia3/dia3.lu').Sections[1].Name, '_Interruption')
+    assert.equal(luResult.get('./dia3/dia3.lu').Sections[1].Body, '- I want to travel to Seattle')
+  })
+
+  it('luis:cross training can get expected result when local intents exist', () => {
+    let luContentArray = []
+
+    luContentArray.push({
+      content:
+        `# dia1_trigger
+        - I want to travel to Seattle
+                    
+        # dia2_trigger
+        - book a hotel for me
+        
+        # local_intent
+        - help`,
+      id: './main/main.lu'}
+    )
+
+    luContentArray.push({
+      content:
+        `# bookTicket
+        - book a flight for me
+        - book a train ticket for me`,
+      id: './dia1/dia1.lu'}
+    )
+
+    luContentArray.push({
+      content:
+        `# hotelLevel
+        - I prefer 4 stars hotel`,
+      id: './dia2/dia2.lu'}
+    )
+
+    let crossTrainConfig = {
+      rootIds: [
+        './main/main.lu'
+      ],
+      triggerRules: {
+        './main/main.lu': {
+          './dia1/dia1.lu': 'dia1_trigger',
+          './dia2/dia2.lu': 'dia2_trigger'
+        }
+      },
+      intentName: '_Interruption',
+      verbose: true
+    }
+
+    const trainedResult = crossTrainer.crossTrain(luContentArray, [], crossTrainConfig)
+    const luResult = trainedResult.luResult
+
+    assert.equal(luResult.get('./dia1/dia1.lu').Sections[1].Name, '_Interruption')
+    assert.equal(luResult.get('./dia1/dia1.lu').Sections[1].Body, '- book a hotel for me')
+
+    assert.equal(luResult.get('./dia2/dia2.lu').Sections[1].Name, '_Interruption')
+    assert.equal(luResult.get('./dia2/dia2.lu').Sections[1].Body, '- I want to travel to Seattle')
+  })
+
+  it('luis:cross training can get expected result when trigger intent or dialog is empty', () => {
+    let luContentArray = []
+
+    luContentArray.push({
+      content:
+        `# dia1_trigger
+        - I want to travel to Seattle
+                    
+        # dia2_trigger
+        - book a hotel for me
+        
+        # dia3_trigger
+        - cancel`,
+      id: './main/main.lu'}
+    )
+
+    luContentArray.push({
+      content:
+        `# bookTicket
+        - book a flight for me
+        - book a train ticket for me`,
+      id: './dia1/dia1.lu'}
+    )
+
+    luContentArray.push({
+      content:
+        `# hotelLevel
+        - I prefer 4 stars hotel`,
+      id: './dia2/dia2.lu'}
+    )
+
+    luContentArray.push({
+      content:
+        `# help
+        - can I help you`,
+      id: './dia3/dia3.lu'}
+    )
+
+    let crossTrainConfig = {
+      rootIds: [
+        './main/main.lu'
+      ],
+      triggerRules: {
+        './main/main.lu': {
+          './dia1/dia1.lu': 'dia1_trigger',
+          './dia2/dia2.lu': 'dia2_trigger',
+          '': 'dia3_trigger',
+          './dia3/dia3.lu': ''
+        }
+      },
+      intentName: '_Interruption',
+      verbose: true
+    }
+
+    const trainedResult = crossTrainer.crossTrain(luContentArray, [], crossTrainConfig)
+    const luResult = trainedResult.luResult
+
+    assert.equal(luResult.get('./dia1/dia1.lu').Sections[1].Name, '_Interruption')
+    assert.equal(luResult.get('./dia1/dia1.lu').Sections[1].Body, `- book a hotel for me${NEWLINE}- cancel`)
 
     assert.equal(luResult.get('./dia2/dia2.lu').Sections[1].Name, '_Interruption')
-    assert.equal(luResult.get('./dia2/dia2.lu').Sections[1].Body, `- book a hotel for me`)
+    assert.equal(luResult.get('./dia2/dia2.lu').Sections[1].Body, `- I want to travel to Seattle${NEWLINE}- cancel`)
 
     assert.equal(luResult.get('./dia3/dia3.lu').Sections[1].Name, '_Interruption')
-    assert.equal(luResult.get('./dia3/dia3.lu').Sections[1].Body, `- I want to travel to Seattle`)
+    assert.equal(luResult.get('./dia3/dia3.lu').Sections[1].Body, `- I want to travel to Seattle${NEWLINE}- book a hotel for me${NEWLINE}- cancel`)
   })
 })