up versioned orchestrator-core to 4.13.1 (#1211)

* Update package.json

Use orchestrator-core v 4.13.1

* Update pnpm-lock.yaml

* skip empty lu file, added empty lu file to test

* Update orchestratorhelper.ts

fixed lint issues

* use forward slash for file path in orchestrator.settings.json to be compatible with non windows platform

* addressed PR comments

Co-authored-by: Emilio Munoz <[email protected]>

Author: tsuwandy

common/config/rush/pnpm-lock.yaml

@@ -40,7 +40,7 @@
     "@types/node-fetch": "~2.5.5",
     "node-fetch": "~2.6.0",
     "tslib": "^2.0.3",
-    "orchestrator-core": "4.13.0",
+    "orchestrator-core": "4.13.1",
     "@types/fs-extra": "~8.1.0",
     "fs-extra": "~9.0.0",
     "read-text-file": "~1.1.0",

packages/orchestratorlib/package.json

@@ -44,7 +44,7 @@ export class OrchestratorBuild {
       let hasLuConfig: boolean = false;
       if (!inputs || inputs.length === 0) {
         if (!luConfig || !luConfig.models || luConfig.models.length === 0) {
-          throw new Error('Please provide lu input');
+          throw new Error('Please provide valid lu input(s)');
         } else {
           hasLuConfig = true;
         }
@@ -72,7 +72,7 @@ export class OrchestratorBuild {
         };
       } = {
         orchestrator: {
-          modelFolder: baseModelPath,
+          modelFolder: baseModelPath.replace(/\\/g, '/'),
           snapshots: new Map<string, string>(),
         },
       };
@@ -282,11 +282,14 @@ export class OrchestratorBuild {
   private static async processLuConfig(luConfig: any, labelResolvers: Map<string, LabelResolver>, fullEmbeddings: boolean = false): Promise<any[]> {
     const luObjects: any[] = [];
     for (const file of (luConfig.models || [])) {
-      const luObject: any = {
-        content: OrchestratorHelper.readFile(file),
-        id: path.basename(file, '.lu'),
-      };
-      luObjects.push(luObject);
+      const content: string = OrchestratorHelper.readFile(file);
+      if (content) {
+        const luObject: any = {
+          content: content,
+          id: path.basename(file, '.lu'),
+        };
+        luObjects.push(luObject);
+      }
     }
     return OrchestratorBuild.processInput(luObjects, labelResolvers, fullEmbeddings);
   }

packages/orchestratorlib/src/build.ts

@@ -7,21 +7,11 @@ import * as path from 'path';
 import * as fs from 'fs-extra';
 require('fast-text-encoding');
 
-import {ITextUtteranceLabelMapDataStructure} from '@microsoft/bf-dispatcher';
-import {Label} from '@microsoft/bf-dispatcher';
-import {LabelStructureUtility} from '@microsoft/bf-dispatcher';
-import {LabelType} from '@microsoft/bf-dispatcher';
-import {ScoreEntity} from '@microsoft/bf-dispatcher';
-import {ScoreIntent} from '@microsoft/bf-dispatcher';
-// import {Span} from '@microsoft/bf-dispatcher';
-
+import {ITextUtteranceLabelMapDataStructure, Label, LabelStructureUtility, LabelType, ScoreEntity, ScoreIntent} from '@microsoft/bf-dispatcher';
 import {LabelResolver} from './labelresolver';
 import {UtilityLabelResolver} from './utilitylabelresolver';
-
 import {PrebuiltToRecognizerMap} from './resources/recognizer-map';
-
-import {OrchestratorBuild} from '.';
-
+import {OrchestratorBuild, OrchestratorSettings} from '.';
 import {Utility} from './utility';
 import {Utility as UtilityDispatcher} from '@microsoft/bf-dispatcher';
 
@@ -63,7 +53,11 @@ export class OrchestratorHelper {
   }
 
   public static readFile(filePath: string): string {
-    return ReadText.readSync(filePath);
+    try {
+      return ReadText.readSync(filePath);
+    } catch {
+      return '';
+    }
   }
 
   public static writeToFile(filePath: string, content: string, options: any = {encoding: 'utf8', flag: 'w'}): string {
@@ -264,7 +258,6 @@ export class OrchestratorHelper {
     utteranceEntityLabelsMap: Map<string, Label[]>,
     utteranceEntityLabelDuplicateMap: Map<string, Label[]>): Promise<void> {
     const ext: string = path.extname(filePath);
-
     if (ext !== '.lu' &&
         ext !== '.json' &&
         ext !== '.qna' &&
@@ -295,6 +288,9 @@ export class OrchestratorHelper {
           utteranceLabelDuplicateMap);
         break;
       case '.json':
+        if (filePath.endsWith(OrchestratorSettings.OrchestratorSettingsFileName)) {
+          return;
+        }
         if (OrchestratorHelper.getIntentsEntitiesUtterances(
           fs.readJsonSync(filePath),
           routingName,
@@ -395,6 +391,9 @@ export class OrchestratorHelper {
     utteranceLabelDuplicateMap: Map<string, Set<string>>,
     utteranceEntityLabelsMap: Map<string, Label[]>,
     utteranceEntityLabelDuplicateMap: Map<string, Label[]>): Promise<void> {
+    if (!luContent || luContent.length === 0) {
+      return;
+    }
     const luObject: any = {
       content: luContent,
       id: luFile,
@@ -1123,16 +1122,16 @@ export class OrchestratorHelper {
     (idsToFind || []).forEach((ask: any)  => {
       const resourceToFind: string = path.isAbsolute(ask.filePath) ? ask.filePath : path.resolve(path.join(baseDir, ask.filePath));
       const fileContent: string = OrchestratorHelper.readFile(resourceToFind);
-      if (!processedFiles.includes(resourceToFind)) {
-        processedFiles.push(resourceToFind);
-      }
       if (fileContent) {
         retPayload.push({
           content: fileContent,
           options: {
             id: ask.filePath,
           },
         });
+        if (!processedFiles.includes(resourceToFind)) {
+          processedFiles.push(resourceToFind);
+        }
       } else {
         throw new Error(`Content not found for ${resourceToFind}.`);
       }
@@ -1150,10 +1149,13 @@ export class OrchestratorHelper {
     } else {
       const ext: string = path.extname(inputPath);
       if (ext === '.lu') {
-        retPayload.push({
-          content: OrchestratorHelper.readFile(inputPath),
-          id: path.basename(inputPath, '.lu'),
-        });
+        const content: string = OrchestratorHelper.readFile(inputPath);
+        if (content) {
+          retPayload.push({
+            content: content,
+            id: path.basename(inputPath, '.lu'),
+          });
+        }
       }
     }
   }
@@ -1204,7 +1206,7 @@ export class OrchestratorHelper {
         Utility.debuggingLog(`Multi language recognizer file written to ${multiRecoFileName}`);
       }
 
-      bluPaths[baseName] = snapshotFile;
+      bluPaths[baseName] = snapshotFile.replace(/\\/g, '/');
     }
   }
 

packages/orchestratorlib/src/orchestratorhelper.ts

@@ -352,7 +352,7 @@ describe('OrchestratorBuildTests', function () {
     assert.ok(retPayload !== null);
     assert.ok(retPayload.outputs !== null);
     assert.ok(retPayload.outputs.length === 5);
-    assert.ok(retPayload.settings.orchestrator.modelFolder === baseModelPath);
+    assert.ok(retPayload.settings.orchestrator.modelFolder === baseModelPath.replace(/\\/g, '/'));
 
     const payLoadOutputs: any[] = retPayload.outputs;
     const snapshots: Map<string, Uint8Array> = new Map<string, Uint8Array>();
@@ -384,6 +384,9 @@ describe('OrchestratorBuildTests', function () {
     assert.ok(Utility.exists('./test/fixtures/output/RootDialog.blu'));
     assert.ok(Utility.exists('./test/fixtures/output/RootDialog.en-us.lu.dialog'));
     assert.ok(Utility.exists('./test/fixtures/output/RootDialog.lu.dialog'));
+
+    const snapshotSettings: any = retPayload.settings.orchestrator.snapshots;
+    assert.ok(snapshotSettings.RootDialog === 'test/fixtures/output/RootDialog.blu');
   });
 
   it('Test.0008 - runAsync changing files', async function () {