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

new(all): Auto import for logo, colors and website content.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2024-05-21 18:11:33 -03:00
parent 56c8f3ce5c
commit d0a860db7f
2 changed files with 43 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
packages/gpt.gblib/services/ChatServices.ts
View file

@ -211,9 +211,13 @@ export class ChatServices {
page = await ChatServices.findPageForText(metadata.source, doc.pageContent);
}
output = `${output}\n\n\n\nUse also the following context which is coming from Source Document: ${filename} at page: ${page?page:'entire document'}
output = `${output}\n\n\n\nUse also the following context which is coming from Source Document: ${filename} at page: ${
page ? page : 'entire document'
}
(you will fill the JSON sources collection field later),
memorize this block among document information and return when you are refering this part of content:\n\n\n\n ${doc.pageContent} \n\n\n\n.`;
memorize this block among document information and return when you are refering this part of content:\n\n\n\n ${
doc.pageContent
} \n\n\n\n.`;
}
return output;
}
@ -251,16 +255,12 @@ export class ChatServices {
private static memoryMap = {};
public static userSystemPrompt = {};
public static async answerByGPT(
min: GBMinInstance,
user,
question: string, mode=null
) {
public static async answerByGPT(min: GBMinInstance, user, question: string, mode = null) {
if (!process.env.OPENAI_API_KEY) {
return { answer: undefined, questionId: 0 };
}
const LLMMode = mode??min.core.getParam(min.instance, 'Answer Mode', 'direct');
const LLMMode = mode ?? min.core.getParam(min.instance, 'Answer Mode', 'direct');
const docsContext = min['vectorStore'];
@ -274,8 +274,8 @@ export class ChatServices {
if (user && !this.memoryMap[user.userSystemId]) {
this.memoryMap[user.userSystemId] = memory;
}
const systemPrompt = user?this.userSystemPrompt[user.userSystemId]:'';
const systemPrompt = user ? this.userSystemPrompt[user.userSystemId] : '';
const model = new ChatOpenAI({
openAIApiKey: process.env.OPENAI_API_KEY,
@ -319,6 +319,18 @@ export class ChatServices {
Standalone question:`)
]);
const jsonInformation = `VERY IMPORTANT: ALWAYS return VALID standard JSON with the folowing structure: 'text' as answer,
sources as an array of ('file' indicating the PDF filename and 'page' indicating the page number) listing all segmented context.
Example JSON format: "text": "this is the answer, anything LLM output as text answer shoud be here.",
"sources": [{{"file": "filename.pdf", "page": 3}}, {{"file": "filename2.pdf", "page": 1}}],
return valid JSON with brackets. Avoid explaining the context directly
to the user; instead, refer to the document source, always return more than one source document
and check if the answer can be extended by using additional contexts in
other files, as specified before.
Double check if the output is a valid JSON with brackets. all fields are required: text, file, page.
`;
const combineDocumentsPrompt = ChatPromptTemplate.fromMessages([
AIMessagePromptTemplate.fromTemplate(
`
@ -330,16 +342,7 @@ export class ChatServices {
rephrase the response to the user using the aforementioned context. If you're unsure of the answer,
utilize any relevant context provided to answer the question effectively. Don´t output MD images tags url previously shown.
VERY IMPORTANT: ALWAYS return VALID standard JSON with the folowing structure: 'text' as answer,
sources as an array of ('file' indicating the PDF filename and 'page' indicating the page number) listing all segmented context.
Example JSON format: "text": "this is the answer, anything LLM output as text answer shoud be here.",
"sources": [{{"file": "filename.pdf", "page": 3}}, {{"file": "filename2.pdf", "page": 1}}],
return valid JSON with brackets. Avoid explaining the context directly
to the user; instead, refer to the document source, always return more than one source document
and check if the answer can be extended by using additional contexts in
other files, as specified before.
Double check if the output is a valid JSON with brackets. all fields are required: text, file, page.
${LLMMode==='document-ref'? jsonInformation: ''}
`
),
new MessagesPlaceholder('chat_history'),
@ -410,7 +413,7 @@ export class ChatServices {
${question}`);
result = result.content;
} else if (LLMMode === 'document') {
} else if (LLMMode === 'document-ref' || LLMMode === 'document') {
const res = await combineDocumentsChain.invoke(question);
result = res.text;
sources = res.sources;
@ -429,7 +432,7 @@ export class ChatServices {
input: question
},
{
output: result?result.replace(/\!\[.*\)/gi, ''): 'no answer' // Removes .MD url beforing adding to history.
output: result ? result.replace(/\!\[.*\)/gi, '') : 'no answer' // Removes .MD url beforing adding to history.
}
);

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

@ -856,7 +856,7 @@ export class KBService implements IGBKBService {
page.setCacheEnabled(false);
const response = await page.goto(url);
if (response.headers && (response.status() === 200 || response.status() === 304)) {
if (response.headers && response.status() === 200) {
const contentType = response.headers()['content-type'];
if (contentType && contentType.includes('text/html')) {
const buffer = await page.content();
@ -983,6 +983,21 @@ export class KBService implements IGBKBService {
return await checkPossibilities(page, possibilities);
}
async getFreshPage(browser, url) {
try {
if (!browser || browser.isConnected() === false) {
browser = await puppeteer.launch({ headless: false }); // Change headless to true if you don't want to see the browser window
}
const page = await browser.newPage();
await page.goto(url);
return page;
} catch (error) {
console.error('An error occurred while getting fresh page:', error);
throw error;
}
}
/**
* Import all .docx files in reading comprehension folder.
*/
@ -1002,9 +1017,8 @@ export class KBService implements IGBKBService {
const website = min.core.getParam<string>(min.instance, 'Website', null);
if (website) {
const browser = await puppeteer.launch({ headless: false });
const page = await browser.newPage();
await page.goto(website);
let browser = await puppeteer.launch({ headless: false});
const page = await this.getFreshPage(browser, website);
const logo = await this.getLogoByPage(page);
let path = DialogKeywords.getGBAIPath(min.botId);