Cherry picked changes from main branch (#1314)

* Update orchestratorhelper.ts

fixed off by one error

* added qna file with \n in it

parsing should be ok!

* Update orchestratorhelper.test.ts

add

* Update orchestratorhelper.ts

removed normalized tabs on qna file

* Update create.ts

use input path given from --in, otherwise use one specified in the orchestratorsettings.json

* Update create.ts

fixed lint errors

Author: tsuwandy

packages/orchestrator/src/commands/orchestrator/create.ts

@@ -62,8 +62,14 @@ export default class OrchestratorCreate extends Command {
 
       const hasDataSources: boolean = settings.DataSources?.inputs?.length > 0 ?? false;
       if (hasDataSources) {
-        input = settings.DataSources.path;
         hierarchical = true;
+        // do not override the input folder from the --in parameter
+        const inputPathSpecified: boolean = !Utility.isEmptyString(flags.in);
+        if (!inputPathSpecified && !Utility.isEmptyString(settings.DataSources.path)) {
+          input = settings.DataSources.path;
+        } else {
+          settings.DataSources.path = flags.in;
+        }
       }
 
       if (refresh) {

packages/orchestratorlib/src/orchestratorhelper.ts

@@ -448,6 +448,7 @@ export class OrchestratorHelper {
         throw new Error('Failed to parse LUIS or JSON file on intent/entity labels');
       }
     } catch (error: any) {
+      Utility.debuggingLog(`EXCEPTION calling getIntentsEntitiesUtterances(), error=${error}`);
       throw new Error(`Failed parsing lu file ${luFile} ${error.text}`);
     }
   }
@@ -609,18 +610,10 @@ export class OrchestratorHelper {
     }
 
     try {
-      const newlines: string[] = [];
-      lines.forEach((line: string) => {
-        if (line.toLowerCase().indexOf('@qna.pair.source =') < 0) {
-          newlines.push(line);
-        }
-      });
-      // Utility.debuggingLog('OrchestratorHelper.parseQnaFile() ready to call QnaMakerBuilder.fromContent()');
-      const qnaNormalized: string = Utility.cleanStringOnTabs(newlines.join('\n')); // ---- NOTE ---- QnaMakerBuilder does not like TAB
-      const qnaObject: any = await QnaMakerBuilder.fromContent(qnaNormalized);
+      const qnaObject: any = await QnaMakerBuilder.fromContent(fileContents);
       OrchestratorHelper.getQnaQuestionsAsUtterances(qnaObject, hierarchicalLabel, utteranceLabelsMap, utteranceLabelDuplicateMap);
     } catch (error: any) {
-      throw new Error(`Failed parsing qna file ${qnaFile} ${error.text}`);
+      throw new Error(`Failed parsing qna file ${qnaFile} ${error.text}\n${JSON.stringify(error)}`);
     }
   }