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

new(kb.gbapp): #259 add several kinds of direct information import.

Browse source
This commit is contained in:
rodrigorodriguez 2023-02-21 18:21:36 -03:00
parent 866b361292
commit da8c7cc863
2 changed files with 48 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -581,14 +581,14 @@ export class GBConversationalService {
await this.sendMarkdownToMobile(min, step, mobile, text);
} else if (GBConfigService.get('DISABLE_WEB') !== 'true') {
const html = marked(text);
await this.sendMarkdownToWeb(min, step, html, answer);
await this.sendHTMLToWeb(min, step, html, answer);
} else {
const html = marked(text);
await min.conversationalService.sendText(min, step, html);
}
}
private async sendMarkdownToWeb (min, step: GBDialogStep, html: string, answer: string) {
private async sendHTMLToWeb (min, step: GBDialogStep, html: string, answer: string) {
const locale = step.context.activity.locale;
html = html.replace(/src\=\"kb\//gi, `src=\"../kb/`);

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

@ -66,6 +66,10 @@ import textract from 'textract';
import pdf from 'pdf-extraction';
import { GBSSR } from '../../core.gbapp/services/GBSSR.js';
import { GBLogEx } from '../../core.gbapp/services/GBLogEx.js';
import mammoth from 'mammoth';
import { url } from 'inspector';
import { min } from 'lodash';
import { GBAdminService } from 'packages/admin.gbapp/services/GBAdminService.js';
/**
* Result for quey on KB data.
@ -653,6 +657,37 @@ export class KBService implements IGBKBService {
prevId: 0 // https://github.com/GeneralBots/BotServer/issues/312
});
}
} else if (file !== null && file.name.endsWith('.docx')) {
const gbaiName = `${instance.botId}.gbai`;
const gbkbName = `${instance.botId}.gbkb`;
const localName = Path.join('work', gbaiName, gbkbName, file.name);
const buffer = Fs.readFileSync(localName, { encoding: null });
var options = {
buffer: buffer,
convertImage: mammoth.images.imgElement(async image => {
const localName = Path.join(
'work',
gbaiName,
'cache',
`img-docx${GBAdminService.getRndReadableIdentifier()}.png`
);
const url = urlJoin(GBServer.globals.publicAddress, instance.botId, 'cache', Path.basename(localName));
const buffer = await image.read();
Fs.writeFileSync(localName, buffer, { encoding: null });
return { src: url };
})
};
const answer = await mammoth.convertToHtml(options);
await GuaribasAnswer.create(<GuaribasAnswer>{
instanceId: instance.instanceId,
content: answer.value,
format: '.docx',
media: file.name,
packageId: packageId,
prevId: 0 // https://github.com/GeneralBots/BotServer/issues/312
});
}
});
}
@ -777,14 +812,6 @@ export class KBService implements IGBKBService {
*/
public async deployKb(core: IGBCoreService, deployer: GBDeployer, localPath: string, min: GBMinInstance) {
const packageName = Path.basename(localPath);
GBLog.info(`[GBDeployer] Opening package: ${localPath}`);
const html = await GBSSR.getHTML(min);
const path = Path.join(process.env.PWD, 'work', `${min.instance.botId}.gbai`, `${min.instance.botId}.gbui`, 'index.html');
GBLogEx.info(min, `[GBDeployer] Generating SSR HTML in ${path}.`);
Fs.writeFileSync(path, html, 'utf8');
const instance = await core.loadInstanceByBotId(min.botId);
GBLog.info(`[GBDeployer] Importing: ${localPath}`);
const p = await deployer.deployPackageToStorage(instance.instanceId, packageName);
@ -796,8 +823,18 @@ export class KBService implements IGBKBService {
min['groupCache'] = await KBService.getGroupReplies(instance.instanceId);
await KBService.RefreshNER(min);
GBLog.info(`[GBDeployer] Opening package: ${localPath}`);
const html = await GBSSR.getHTML(min);
const path = Path.join(
process.env.PWD,
'work',
`${min.instance.botId}.gbai`,
`${min.instance.botId}.gbui`,
'index.html'
);
GBLogEx.info(min, `[GBDeployer] Generating SSR HTML in ${path}.`);
Fs.writeFileSync(path, html, 'utf8');
GBLog.info(`[GBDeployer] Finished import of ${localPath}`);
}