NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-12-20 12:22:21 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: Add support for splitMessages and timePerChar in Integrations

Browse Source
This commit is contained in:
Davidson Gomes
2024-10-11 07:45:50 -03:00
parent 29e2cfaf96
commit d50da79f22
17 changed files with 566 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/api/integrations/chatbot/openai/controllers/openai.controller.ts
View File

@@ -191,7 +191,9 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
!data.stopBotFromMe ||
!data.keepOpen ||
!data.debounceTime ||
!data.ignoreJids
!data.ignoreJids ||
!data.splitMessages ||
!data.timePerChar
) {
const defaultSettingCheck = await this.settingsRepository.findFirst({
where: {
@@ -209,6 +211,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
if (!data.keepOpen) data.keepOpen = defaultSettingCheck?.keepOpen || false;
if (!data.debounceTime) data.debounceTime = defaultSettingCheck?.debounceTime || 0;
if (!data.ignoreJids) data.ignoreJids = defaultSettingCheck?.ignoreJids || [];
if (!data.splitMessages) data.splitMessages = defaultSettingCheck?.splitMessages || false;
if (!data.timePerChar) data.timePerChar = defaultSettingCheck?.timePerChar || 0;
if (!data.openaiCredsId) {
throw new Error('Openai Creds Id is required');
@@ -226,6 +230,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
keepOpen: data.keepOpen,
debounceTime: data.debounceTime,
ignoreJids: data.ignoreJids,
splitMessages: data.splitMessages,
timePerChar: data.timePerChar,
});
}
}
@@ -338,6 +344,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
triggerOperator: data.triggerOperator,
triggerValue: data.triggerValue,
ignoreJids: data.ignoreJids,
splitMessages: data.splitMessages,
timePerChar: data.timePerChar,
},
});
@@ -546,6 +554,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
triggerOperator: data.triggerOperator,
triggerValue: data.triggerValue,
ignoreJids: data.ignoreJids,
splitMessages: data.splitMessages,
timePerChar: data.timePerChar,
},
});
@@ -637,6 +647,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
speechToText: data.speechToText,
openaiIdFallback: data.openaiIdFallback,
ignoreJids: data.ignoreJids,
splitMessages: data.splitMessages,
timePerChar: data.timePerChar,
},
});
@@ -653,6 +665,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
speechToText: updateSettings.speechToText,
openaiIdFallback: updateSettings.openaiIdFallback,
ignoreJids: updateSettings.ignoreJids,
splitMessages: updateSettings.splitMessages,
timePerChar: updateSettings.timePerChar,
};
}
@@ -671,6 +685,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
ignoreJids: data.ignoreJids,
speechToText: data.speechToText,
instanceId: instanceId,
splitMessages: data.splitMessages,
timePerChar: data.timePerChar,
},
});
@@ -686,6 +702,9 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
debounceTime: newSetttings.debounceTime,
openaiIdFallback: newSetttings.openaiIdFallback,
ignoreJids: newSetttings.ignoreJids,
speechToText: newSetttings.speechToText,
splitMessages: newSetttings.splitMessages,
timePerChar: newSetttings.timePerChar,
};
} catch (error) {
this.logger.error(error);
@@ -726,6 +745,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
stopBotFromMe: false,
keepOpen: false,
ignoreJids: [],
splitMessages: false,
timePerChar: 0,
openaiIdFallback: null,
speechToText: false,
fallback: null,
@@ -742,6 +763,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
stopBotFromMe: settings.stopBotFromMe,
keepOpen: settings.keepOpen,
ignoreJids: settings.ignoreJids,
splitMessages: settings.splitMessages,
timePerChar: settings.timePerChar,
openaiIdFallback: settings.openaiIdFallback,
speechToText: settings.speechToText,
fallback: settings.Fallback,
@@ -972,6 +995,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
let keepOpen = findBot?.keepOpen;
let debounceTime = findBot?.debounceTime;
let ignoreJids = findBot?.ignoreJids;
let splitMessages = findBot?.splitMessages;
let timePerChar = findBot?.timePerChar;
if (!expire) expire = settings.expire;
if (!keywordFinish) keywordFinish = settings.keywordFinish;
@@ -982,6 +1007,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
if (!keepOpen) keepOpen = settings.keepOpen;
if (!debounceTime) debounceTime = settings.debounceTime;
if (!ignoreJids) ignoreJids = settings.ignoreJids;
if (splitMessages === undefined || splitMessages === null) splitMessages = settings?.splitMessages ?? false;
if (timePerChar === undefined || timePerChar === null) timePerChar = settings?.timePerChar ?? 0;
const key = msg.key as {
id: string;
@@ -1030,6 +1057,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
keepOpen,
debounceTime,
ignoreJids,
splitMessages,
timePerChar,
},
debouncedContent,
);
@@ -1053,6 +1082,8 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
keepOpen,
debounceTime,
ignoreJids,
splitMessages,
timePerChar,
},
debouncedContent,
);

4
src/api/integrations/chatbot/openai/dto/openai.dto.ts
View File

@@ -29,6 +29,8 @@ export class OpenaiDto {
triggerOperator?: TriggerOperator;
triggerValue?: string;
ignoreJids?: any;
splitMessages?: boolean;
timePerChar?: number;
}
export class OpenaiSettingDto {
@@ -44,4 +46,6 @@ export class OpenaiSettingDto {
openaiIdFallback?: string;
ignoreJids?: any;
speechToText?: boolean;
splitMessages?: boolean;
timePerChar?: number;
}

111
src/api/integrations/chatbot/openai/services/openai.service.ts
View File

@@ -188,16 +188,54 @@ export class OpenaiService {
}
if (mediaType) {
const splitMessages = settings.splitMessages ?? false;
const timePerChar = settings.timePerChar ?? 0;
const minDelay = 1000;
const maxDelay = 20000;
if (textBuffer.trim()) {
await instance.textMessage(
{
number: remoteJid.split('@')[0],
delay: settings?.delayMessage || 1000,
text: textBuffer.trim(),
},
false,
);
textBuffer = '';
if (splitMessages) {
const multipleMessages = textBuffer.trim().split('\n\n');
for (let index = 0; index < multipleMessages.length; index++) {
const message = multipleMessages[index];
const delay = Math.min(Math.max(message.length * timePerChar, minDelay), maxDelay);
if (instance.integration === Integration.WHATSAPP_BAILEYS) {
await instance.client.presenceSubscribe(remoteJid);
await instance.client.sendPresenceUpdate('composing', remoteJid);
}
await new Promise<void>((resolve) => {
setTimeout(async () => {
await instance.textMessage(
{
number: remoteJid.split('@')[0],
delay: settings?.delayMessage || 1000,
text: message,
},
false,
);
resolve();
}, delay);
});
if (instance.integration === Integration.WHATSAPP_BAILEYS) {
await instance.client.sendPresenceUpdate('paused', remoteJid);
}
}
} else {
await instance.textMessage(
{
number: remoteJid.split('@')[0],
delay: settings?.delayMessage || 1000,
text: textBuffer.trim(),
},
false,
);
textBuffer = '';
}
}
if (mediaType === 'audio') {
@@ -234,15 +272,54 @@ export class OpenaiService {
}
}
const splitMessages = settings.splitMessages ?? false;
const timePerChar = settings.timePerChar ?? 0;
const minDelay = 1000;
const maxDelay = 20000;
if (textBuffer.trim()) {
await instance.textMessage(
{
number: remoteJid.split('@')[0],
delay: settings?.delayMessage || 1000,
text: textBuffer.trim(),
},
false,
);
if (splitMessages) {
const multipleMessages = textBuffer.trim().split('\n\n');
for (let index = 0; index < multipleMessages.length; index++) {
const message = multipleMessages[index];
const delay = Math.min(Math.max(message.length * timePerChar, minDelay), maxDelay);
if (instance.integration === Integration.WHATSAPP_BAILEYS) {
await instance.client.presenceSubscribe(remoteJid);
await instance.client.sendPresenceUpdate('composing', remoteJid);
}
await new Promise<void>((resolve) => {
setTimeout(async () => {
await instance.textMessage(
{
number: remoteJid.split('@')[0],
delay: settings?.delayMessage || 1000,
text: message,
},
false,
);
resolve();
}, delay);
});
if (instance.integration === Integration.WHATSAPP_BAILEYS) {
await instance.client.sendPresenceUpdate('paused', remoteJid);
}
}
} else {
await instance.textMessage(
{
number: remoteJid.split('@')[0],
delay: settings?.delayMessage || 1000,
text: textBuffer.trim(),
},
false,
);
textBuffer = '';
}
}
sendTelemetry('/message/sendText');