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

fix(basic.gblib): update ChatServices.ts #420

Closed
eltociear wants to merge 2540 commits from patch-1 into main
pull from: patch-1
merge into: GeneralBots:main
Conversation 1 Commits 2540 Files changed 292 +10 -13
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f42e42c5e2 - Show all commits

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

@ -41,7 +41,7 @@ import {
import { RunnableSequence } from '@langchain/core/runnables'; import { RunnableSequence } from '@langchain/core/runnables';
import { convertToOpenAITool } from '@langchain/core/utils/function_calling'; import { convertToOpenAITool } from '@langchain/core/utils/function_calling';
import { ChatOpenAI } from '@langchain/openai'; import { ChatOpenAI } from '@langchain/openai';
import { GBLog, GBMinInstance } from 'botlib'; import { GBMinInstance } from 'botlib';
import * as Fs from 'fs'; import * as Fs from 'fs';
import { jsonSchemaToZod } from 'json-schema-to-zod'; import { jsonSchemaToZod } from 'json-schema-to-zod';
import { BufferWindowMemory } from 'langchain/memory'; import { BufferWindowMemory } from 'langchain/memory';
@ -49,8 +49,6 @@ import Path from 'path';
import { CollectionUtil } from 'pragmatismo-io-framework'; import { CollectionUtil } from 'pragmatismo-io-framework';
import { DialogKeywords } from '../../basic.gblib/services/DialogKeywords.js'; import { DialogKeywords } from '../../basic.gblib/services/DialogKeywords.js';
import { GBVMService } from '../../basic.gblib/services/GBVMService.js'; import { GBVMService } from '../../basic.gblib/services/GBVMService.js';
import { GBConfigService } from '../../core.gbapp/services/GBConfigService.js';
import { GuaribasSubject } from '../../kb.gbapp/models/index.js';
import { Serialized } from '@langchain/core/load/serializable'; import { Serialized } from '@langchain/core/load/serializable';
import { BaseCallbackHandler } from '@langchain/core/callbacks/base'; import { BaseCallbackHandler } from '@langchain/core/callbacks/base';
import { pdfToPng, PngPageOutput } from 'pdf-to-png-converter'; import { pdfToPng, PngPageOutput } from 'pdf-to-png-converter';
@ -252,7 +250,7 @@ export class ChatServices {
*/ */
public static async continue(min: GBMinInstance, question: string, chatId) {} public static async continue(min: GBMinInstance, question: string, chatId) {}
private static memoryMap = {}; public static memoryMap = {};
public static userSystemPrompt = {}; 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) {
@ -269,7 +267,8 @@ export class ChatServices {
memory = new BufferWindowMemory({ memory = new BufferWindowMemory({
returnMessages: true, returnMessages: true,
memoryKey: 'chat_history', memoryKey: 'chat_history',
inputKey: 'input', humanPrefix: 'input',
aiPrefix: 'output',
k: 2 k: 2
}); });
@ -305,7 +304,7 @@ export class ChatServices {
${toolsAsText} ${toolsAsText}
Do not use any previous tools output in the chat_history. Do not use any previous tools output in the {chat_history}.
` `
), ),
new MessagesPlaceholder('chat_history'), new MessagesPlaceholder('chat_history'),
@ -344,16 +343,14 @@ export class ChatServices {
\n\n{context}\n\n \n\n{context}\n\n
*********************** ***********************
AND based on this chat history: rephrase the response to the Human using the aforementioned context, considering this a high
************************
\n\n{chat_history}\n\n
************************
Rephrase the response to the Human using the aforementioned context, considering this a high
attention in answers, to give meaning with everything that has been said. If you're unsure attention in answers, to give meaning with everything that has been said. If you're unsure
of the answer, utilize any relevant context provided to answer the question effectively. of the answer, utilize any relevant context provided to answer the question effectively.
Don´t output MD images tags url previously shown. Don´t output MD images tags url previously shown.
${LLMMode==='document-ref'? jsonInformation: ''} ${LLMMode==='document-ref'? jsonInformation: ''}
And based on this chat history and question, answer combined.
` `
), ),
new MessagesPlaceholder('chat_history'), new MessagesPlaceholder('chat_history'),

2
packages/whatsapp.gblib/services/WhatsappDirectLine.ts
View file

@ -1070,7 +1070,7 @@ export class WhatsappDirectLine extends GBService {
user = await sec.updateUserInstance(id, instance.instanceId); user = await sec.updateUserInstance(id, instance.instanceId);
await (activeMin as any).whatsAppDirectLine.resetConversationId(activeMin.botId, id, ''); await (activeMin as any).whatsAppDirectLine.resetConversationId(activeMin.botId, id, '');
const startDialog = activeMin.core.getParam(activeMin.instance, 'Start Dialog', null); const startDialog = activeMin.core.getParam(activeMin.instance, 'Start Dialog', null);
ChatServices.memoryMap [user.userSystemId] = null;
if (startDialog) { if (startDialog) {
GBLogEx.info(this.min, `Calling /start for Auto start : ${startDialog} for ${activeMin.instance.botId}...`); GBLogEx.info(this.min, `Calling /start for Auto start : ${startDialog} for ${activeMin.instance.botId}...`);