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

fix(kb.gbapp): MSFT Translator will not break MD.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2020-06-04 18:31:53 -03:00
parent ca2de56b06
commit 6523134826
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
packages/kb.gbapp/services/KBService.ts
View file

@ -301,7 +301,7 @@ export class KBService implements IGBKBService {
let media = null; let media = null;
if (typeof (answer) !== "string" ) { if (typeof (answer) !== "string") {
GBLog.info(`[GBImporter] Answer is NULL related to Question '${question}'.`); GBLog.info(`[GBImporter] Answer is NULL related to Question '${question}'.`);
answer = 'Existe um problema na base de conhecimento. Fui treinado para entender sua pergunta, avise a quem me criou que a resposta não foi informada para esta pergunta.'; answer = 'Existe um problema na base de conhecimento. Fui treinado para entender sua pergunta, avise a quem me criou que a resposta não foi informada para esta pergunta.';
} else if (answer.indexOf('.md') > -1) { } else if (answer.indexOf('.md') > -1) {
@ -400,7 +400,24 @@ export class KBService implements IGBKBService {
} }
private async playMarkdown(min: GBMinInstance, answer: GuaribasAnswer, channel: string, step: GBDialogStep, conversationalService: IGBConversationalService) { private async playMarkdown(min: GBMinInstance, answer: GuaribasAnswer, channel: string, step: GBDialogStep, conversationalService: IGBConversationalService) {
let html = answer.content;
let sec = new SecService();
const member = step.context.activity.from;
const user = await sec.ensureUser(min.instance.instanceId, member.id,
member.name, "", "web", member.name);
const minBoot = GBServer.globals.minBoot as any;
// Calls language translator.
let text = await min.conversationalService.translate(
min.instance.translatorKey ? min.instance.translatorKey : minBoot.instance.translatorKey,
min.instance.translatorEndpoint ? min.instance.translatorEndpoint : minBoot.instance.translatorEndpoint,
answer.content,
user.locale ? user.locale : 'pt'
);
// Converts from Markdown to HTML.
marked.setOptions({ marked.setOptions({
renderer: new marked.Renderer(), renderer: new marked.Renderer(),
gfm: true, gfm: true,
@ -412,24 +429,19 @@ export class KBService implements IGBKBService {
smartypants: false, smartypants: false,
xhtml: false xhtml: false
}); });
html = marked(answer.content);
// MSFT Translator breaks markdown, so we need to fix it:
text = text.replace('! [', '![').replace('] (','](');
const html = marked(text);
// According to the channel, formats the output optimized to it.
if (channel === 'webchat' && if (channel === 'webchat' &&
GBConfigService.get('DISABLE_WEB') !== 'true') { GBConfigService.get('DISABLE_WEB') !== 'true') {
await this.sendMarkdownToWeb(min, step, conversationalService, html, answer); await this.sendMarkdownToWeb(min, step, conversationalService, html, answer);
} }
else if (channel === 'whatsapp') { else if (channel === 'whatsapp') {
let sec = new SecService();
const member = step.context.activity.from;
const user = await sec.ensureUser(min.instance.instanceId, member.id,
member.name, "", "web", member.name);
const minBoot = GBServer.globals.minBoot as any;
let text = await min.conversationalService.translate(
min.instance.translatorKey ? min.instance.translatorKey : minBoot.instance.translatorKey,
min.instance.translatorEndpoint ? min.instance.translatorEndpoint : minBoot.instance.translatorEndpoint,
answer.content,
user.locale ? user.locale : 'pt'
);
await conversationalService.sendMarkdownToMobile(min, step, null, text); await conversationalService.sendMarkdownToMobile(min, step, null, text);
} }
@ -533,7 +545,7 @@ export class KBService implements IGBKBService {
return await this.importKbTabularFile(urlJoin(file.root, file.name), instance.instanceId, packageId); return await this.importKbTabularFile(urlJoin(file.root, file.name), instance.instanceId, packageId);
} }
}) })
} }
public async importSubjectFile(packageId: number, filename: string, instance: IGBInstance): Promise<any> { public async importSubjectFile(packageId: number, filename: string, instance: IGBInstance): Promise<any> {