GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(all): NLP error handling improved.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2020-12-22 09:06:46 -03:00
parent efed759aea
commit 6ed7380b76
1 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
packages/core.gbapp/services/GBConversationalService.ts
View file

@ -601,7 +601,7 @@ export class GBConversationalService {
try { try {
const saved = step.context.activity.text; const saved = step.context.activity.text;
step.context.activity.text = text; step.context.activity.text = text;
nlp = await model.recognize(step.context,{},{},{IncludeAllIntents:false, IncludeInstanceData: false, includeAPIResults: true}); nlp = await model.recognize(step.context, {}, {}, { IncludeAllIntents: false, IncludeInstanceData: false, includeAPIResults: true });
step.context.activity.text = saved; step.context.activity.text = saved;
} catch (error) { } catch (error) {
// tslint:disable:no-unsafe-any // tslint:disable:no-unsafe-any
@ -644,30 +644,24 @@ export class GBConversationalService {
`NLP called: ${intent}, entities: ${nlp.entities.length}, score: ${score} > required (nlpScore): ${instanceScore}` `NLP called: ${intent}, entities: ${nlp.entities.length}, score: ${score} > required (nlpScore): ${instanceScore}`
); );
try { step.activeDialog.state.options.entities = nlp.entities;
step.activeDialog.state.options.entities = nlp.entities;
// FIX MSFT NLP issue. // FIX MSFT NLP issue.
if (nlp.entities) { if (nlp.entities) {
await CollectionUtil.asyncForEach(Object.keys(nlp.entities), async key => { await CollectionUtil.asyncForEach(Object.keys(nlp.entities), async key => {
if (key !== "$instance") { if (key !== "$instance") {
let entity = nlp.entities[key]; let entity = nlp.entities[key];
if (Array.isArray(entity[0])) { if (Array.isArray(entity[0])) {
nlp.entities[key] = entity.slice(1); nlp.entities[key] = entity.slice(1);
}
} }
}); }
} });
await step.replaceDialog(`/${intent}`, step.activeDialog.state.options);
return true;
} catch (error) {
const msg = `Error finding dialog associated to NLP event: ${intent}: ${error.message}`;
throw new Error(msg);
} }
await step.replaceDialog(`/${intent}`, step.activeDialog.state.options);
return true;
} }
GBLog.info( GBLog.info(
@ -777,15 +771,30 @@ export class GBConversationalService {
} }
public async sendText(min: GBMinInstance, step, text) { public async sendText(min: GBMinInstance, step, text) {
await this['sendTextWithOptions'](min, step, text, true); await this['sendTextWithOptions'](min, step, text, true, null);
} }
public async sendTextWithOptions(min: GBMinInstance, step, text, translate) { public async sendTextWithOptions(min: GBMinInstance, step, text, translate, keepTextList) {
const member = step.context.activity.from; const member = step.context.activity.from;
const user = await min.userProfile.get(step.context, {}); const user = await min.userProfile.get(step.context, {});
const systemUser = user.systemUser; const systemUser = user.systemUser;
if (translate) { if (translate) {
let replacements = [];
if (keepTextList) {
keepTextList = keepTextList.filter(p => p.trim() !== '');
let i = 0;
await CollectionUtil.asyncForEach(keepTextList, item => {
if (text.toLowerCase().indexOf(item.toLowerCase()) != -1) {
const replacementToken = GBAdminService['getNumberIdentifier']();
replacements[i] = { text: item, replacementToken: replacementToken };
i++;
text = text.replace(new RegExp(item.trim(), 'gi'), `${replacementToken}`);
}
});
}
text = await min.conversationalService.translate( text = await min.conversationalService.translate(
min, min,
text, text,
@ -793,6 +802,15 @@ export class GBConversationalService {
? systemUser.locale ? systemUser.locale
: min.core.getParam<string>(min.instance, 'Locale', GBConfigService.get('LOCALE')) : min.core.getParam<string>(min.instance, 'Locale', GBConfigService.get('LOCALE'))
); );
if (keepTextList) {
let i = 0;
await CollectionUtil.asyncForEach(replacements, item => {
i++;
text = text.replace(new RegExp(`${item.replacementToken}`, 'gi'), item.text);
});
}
GBLog.info(`Translated text(sendText): ${text}.`); GBLog.info(`Translated text(sendText): ${text}.`);
} }
@ -804,6 +822,8 @@ export class GBConversationalService {
} else { } else {
await step.context.sendActivity(text); await step.context.sendActivity(text);
} }
} }
public async broadcast(min: GBMinInstance, message: string) { public async broadcast(min: GBMinInstance, message: string) {