Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

Commit 47252a5

Browse files
munozemiliomunozemilio
committed
Fixing PR feedback
1 parent 12cb18a commit 47252a5

File tree

7 files changed

+37
-25
lines changed

7 files changed

+37
-25
lines changed

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -265,15 +265,19 @@ constructModelDescFromLUISJSON = async function(LUISJSON) {
265265
*/
266266
const sortLUISJSON = async function(LUISJSON) {
267267
// sort intents first
268-
LUISJSON.intents.sort(sortComparers.compareNameFn);
269-
LUISJSON.composites.sort(sortComparers.compareNameFn);
270-
LUISJSON.entities.sort(sortComparers.compareNameFn);
271-
LUISJSON.closedLists.sort(sortComparers.compareNameFn);
272-
LUISJSON.regex_entities.sort(sortComparers.compareNameFn);
273-
LUISJSON.model_features.sort(sortComparers.compareNameFn);
274-
LUISJSON.patternAnyEntities.sort(sortComparers.compareNameFn);
275-
LUISJSON.prebuiltEntities.sort(sortComparers.compareNameFn);
276-
LUISJSON.utterances.sort(sortComparers.compareIntentFn);
268+
try {
269+
LUISJSON.intents.sort(sortComparers.compareNameFn);
270+
LUISJSON.composites.sort(sortComparers.compareNameFn);
271+
LUISJSON.entities.sort(sortComparers.compareNameFn);
272+
LUISJSON.closedLists.sort(sortComparers.compareNameFn);
273+
LUISJSON.regex_entities.sort(sortComparers.compareNameFn);
274+
LUISJSON.model_features.sort(sortComparers.compareNameFn);
275+
LUISJSON.patternAnyEntities.sort(sortComparers.compareNameFn);
276+
LUISJSON.prebuiltEntities.sort(sortComparers.compareNameFn);
277+
LUISJSON.utterances.sort(sortComparers.compareIntentFn);
278+
} catch (e) {
279+
throw (new exception(retCode.errorCode.INVALID_INPUT, 'Sorry, invalid LUIS json object'));
280+
}
277281
}
278282

279283
const sortComparers = {

‎packages/luis/parser/converters/qnajsontoqnaconverter.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,21 +102,29 @@ const parseQnA= async function(qnaObject, src, sort, isAlterations){
102102
* @param {Object} QnAJSON
103103
*/
104104
const sortQnAJSON = function(QnAJSON) {
105-
(QnAJSON.qnaList || []).forEach(pair => {
106-
pair.questions.sort(sortComparers.compareFn);
107-
});
108-
QnAJSON.qnaList.sort(sortComparers.compareQn);
105+
try {
106+
(QnAJSON.qnaList || []).forEach(pair => {
107+
pair.questions.sort(sortComparers.compareFn);
108+
});
109+
QnAJSON.qnaList.sort(sortComparers.compareQn);
110+
} catch (e) {
111+
throw (new exception(retCode.errorCode.INVALID_INPUT, 'Sorry, invalid QnA Maker json object'));
112+
}
109113
};
110114

111115
/**
112116
* Helper function to return sorted QnA Alterations pair
113117
* @param {Object} QnAAltJSON
114118
*/
115119
const sortQnAAltJSON = function(QnAAltJSON) {
116-
(QnAAltJSON.wordAlterations || []).forEach(word => {
117-
word.alterations.sort(sortComparers.compareFn);
118-
});
119-
QnAAltJSON.wordAlterations.sort(sortComparers.compareAltName);
120+
try {
121+
(QnAAltJSON.wordAlterations || []).forEach(word => {
122+
word.alterations.sort(sortComparers.compareFn);
123+
});
124+
QnAAltJSON.wordAlterations.sort(sortComparers.compareAltName);
125+
} catch (e) {
126+
throw (new exception(retCode.errorCode.INVALID_INPUT, 'Sorry, invalid QnA Maker json object'));
127+
}
120128
};
121129

122130
/**

‎packages/luis/parser/translator/lutranslate.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ async function translateLuObject(luObject, translate_key, to_lang, src_lang, tra
6464
let tgt_lang = toLang[idx].trim();
6565
if (tgt_lang === '') continue;
6666
try {
67-
parsedLocContent = await translateHelpers.parseAndTranslate(luObject, translate_key, tgt_lang, src_lang, translate_comments, translate_link_text, false, undefined)
67+
parsedLocContent = await translateHelpers.parseAndTranslate(luObject, translate_key, tgt_lang, src_lang, translate_comments, translate_link_text, false)
6868
} catch (err) {
6969
throw(err);
7070
}

‎packages/luis/src/commands/luis/convert.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default class LuisConvert extends Command {
3333
// Parse the object depending on the input
3434
let result: any
3535
if (isLu) {
36-
let luFiles = await file.getLuFiles(flags.in, flags.recurse)
36+
const luFiles = await file.getLuFiles(flags.in, flags.recurse)
3737
result = await luConverter.parseLuToLuis(luFiles, flags.log, flags.culture)
3838
} else {
3939
result = await luisConverter.parseLuisFileToLu(flags.in, flags.sort)

‎packages/luis/src/commands/luis/translate.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default class LuisTranslate extends Command {
2626
try {
2727
const {flags} = this.parse(LuisTranslate)
2828
let inputStat = await fs.stat(flags.in)
29-
let outputStat = flags.out ? await fs.stat(flags.out) : undefined
29+
let outputStat = flags.out ? await fs.stat(flags.out) : null
3030

3131
if (outputStat && outputStat.isFile()) {
3232
throw new CLIError('Output can only be writen to a folder')
@@ -42,7 +42,7 @@ export default class LuisTranslate extends Command {
4242
translation = await luTranslator.translateLuObj(result, flags.translatekey, flags.tgtlang, flags.srclang, flags.translate_comments, flags.translate_link_text)
4343
result = {}
4444
Object.keys(translation).forEach(async idx => {
45-
result[flags.in][idx] = await luConverter.parseFile(translation[idx][0], false, undefined)
45+
result[flags.in][idx] = await luConverter.parseFile(translation[idx][0], false)
4646
})
4747
}
4848

‎packages/luis/src/commands/qnamaker/convert.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default class QnamakerConvert extends Command {
3131
// Parse the object depending on the input
3232
let result: any
3333
if (isQnA) {
34-
let luFiles = await file.getLuFiles(flags.in, flags.recurse)
34+
const luFiles = await file.getLuFiles(flags.in, flags.recurse)
3535
result = await luConverter.parseQnaToJson(luFiles, false, flags.luis_culture)
3636
} else {
3737
result = await qnaConverter.parseQnAFileToLu(flags.in, flags.sort, flags.alterations)

‎packages/luis/src/commands/qnamaker/translate.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default class QnamakerTranslate extends Command {
2626
try {
2727
const {flags} = this.parse(QnamakerTranslate)
2828
let inputStat = await fs.stat(flags.in)
29-
let outputStat = flags.out ? await fs.stat(flags.out) : undefined
29+
let outputStat = flags.out ? await fs.stat(flags.out) : null
3030

3131
if (outputStat && outputStat.isFile()) {
3232
throw new CLIError('Output can only be writen to a folder')
@@ -35,14 +35,14 @@ export default class QnamakerTranslate extends Command {
3535
let isLu = !inputStat.isFile() ? true : path.extname(flags.in) === '.lu'
3636
let result: any
3737
if (isLu) {
38-
let luFiles = await fileHelper.getLuFiles(flags.in, flags.recurse)
38+
const luFiles = await fileHelper.getLuFiles(flags.in, flags.recurse)
3939
result = await luTranslator.translateLuFile(luFiles, flags.translatekey, flags.tgtlang, flags.srclang, flags.translate_comments, flags.translate_link_text)
4040
} else {
4141
let translation = await qnaConverter.parseQnAFileToLu(flags.in, false, false)
4242
translation = await luTranslator.translateLuObj(translation, flags.translatekey, flags.tgtlang, flags.srclang, flags.translate_comments, flags.translate_link_text)
4343
result = {}
4444
Object.keys(translation).forEach(async idx => {
45-
result[flags.in][idx] = await luConverter.parseFile(translation[idx][0], false, undefined)
45+
result[flags.in][idx] = await luConverter.parseFile(translation[idx][0], false)
4646
})
4747
}
4848

0 commit comments

Comments
 (0)