NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-07-14 01:41:24 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: translation in manager: English, Portuguese, Spanish and French

Browse Source
This commit is contained in:
Davidson Gomes 2024-08-20 07:29:14 -03:00
parent 9ae5255d5f
commit 046c64c65d
10 changed files with 436 additions and 387 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,3 +1,10 @@
# 2.1.0 (develop)
### Features
* Improved layout manager
* Translation in manager: English, Portuguese, Spanish and French
# 2.0.10 (2024-08-16 16:23) # 2.0.10 (2024-08-16 16:23)
### Features ### Features

381
manager/dist/assets/index-AqIWTWDr.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
manager/dist/assets/index-BJ9JMAl_.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

356
manager/dist/assets/index-Cqx_OwQi.js vendored
View File

File diff suppressed because one or more lines are too long

1
manager/dist/assets/index-DZ0gaAHg.css vendored
View File

File diff suppressed because one or more lines are too long

4
manager/dist/index.html vendored
View File

@ -5,8 +5,8 @@
<link rel="icon" type="image/png" href="/assets/images/evolution-logo.png" /> <link rel="icon" type="image/png" href="/assets/images/evolution-logo.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Evolution Manager</title> <title>Evolution Manager</title>
<script type="module" crossorigin src="/assets/index-Cqx_OwQi.js"></script> <script type="module" crossorigin src="/assets/index-AqIWTWDr.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-DZ0gaAHg.css"> <link rel="stylesheet" crossorigin href="/assets/index-BJ9JMAl_.css">
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "evolution-api", "name": "evolution-api",
"version": "2.0.10", "version": "2.1.0",
"description": "Rest api for communication with WhatsApp", "description": "Rest api for communication with WhatsApp",
"main": "./dist/main.js", "main": "./dist/main.js",
"type": "commonjs", "type": "commonjs",

2
prisma/postgresql-migrations/20240819154941_add_context_to_integration_session/migration.sql Normal file
View File

@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "IntegrationSession" ADD COLUMN "context" JSONB;

1
prisma/postgresql-schema.prisma
View File

@ -394,6 +394,7 @@ model IntegrationSession {
pushName String? pushName String?
status SessionStatus status SessionStatus
awaitUser Boolean @default(false) @db.Boolean awaitUser Boolean @default(false) @db.Boolean
context Json?
createdAt DateTime? @default(now()) @db.Timestamp createdAt DateTime? @default(now()) @db.Timestamp
updatedAt DateTime @updatedAt @db.Timestamp updatedAt DateTime @updatedAt @db.Timestamp
Message Message[] Message Message[]

50
src/api/integrations/openai/services/openai.service.ts
View File

@ -1241,7 +1241,7 @@ export class OpenaiService {
}; };
if (stopBotFromMe && key.fromMe && session) { if (stopBotFromMe && key.fromMe && session) {
await this.prismaRepository.integrationSession.update({ session = await this.prismaRepository.integrationSession.update({
where: { where: {
id: session.id, id: session.id,
}, },
@ -1249,7 +1249,6 @@ export class OpenaiService {
status: 'paused', status: 'paused',
}, },
}); });
return;
} }
if (!listeningFromMe && key.fromMe) { if (!listeningFromMe && key.fromMe) {
@ -1263,6 +1262,7 @@ export class OpenaiService {
this.waMonitor.waInstances[instance.instanceName], this.waMonitor.waInstances[instance.instanceName],
remoteJid, remoteJid,
pushName, pushName,
key.fromMe,
findOpenai, findOpenai,
session, session,
settings, settings,
@ -1287,6 +1287,7 @@ export class OpenaiService {
this.waMonitor.waInstances[instance.instanceName], this.waMonitor.waInstances[instance.instanceName],
remoteJid, remoteJid,
pushName, pushName,
key.fromMe,
findOpenai, findOpenai,
session, session,
settings, settings,
@ -1355,6 +1356,7 @@ export class OpenaiService {
instance: any, instance: any,
remoteJid: string, remoteJid: string,
pushName: string, pushName: string,
fromMe: boolean,
openaiBot: OpenaiBot, openaiBot: OpenaiBot,
settings: OpenaiSetting, settings: OpenaiSetting,
session: IntegrationSession, session: IntegrationSession,
@ -1371,7 +1373,7 @@ export class OpenaiService {
} }
const messageData: any = { const messageData: any = {
role: 'user', role: fromMe ? 'assistant' : 'user',
content: [{ type: 'text', text: content }], content: [{ type: 'text', text: content }],
}; };
@ -1393,6 +1395,11 @@ export class OpenaiService {
await this.client.beta.threads.messages.create(data.session.sessionId, messageData); await this.client.beta.threads.messages.create(data.session.sessionId, messageData);
if (fromMe) {
sendTelemetry('/message/sendText');
return;
}
const runAssistant = await this.client.beta.threads.runs.create(data.session.sessionId, { const runAssistant = await this.client.beta.threads.runs.create(data.session.sessionId, {
assistant_id: openaiBot.assistantId, assistant_id: openaiBot.assistantId,
}); });
@ -1561,12 +1568,13 @@ export class OpenaiService {
instance: any, instance: any,
remoteJid: string, remoteJid: string,
pushName: string, pushName: string,
fromMe: boolean,
openaiBot: OpenaiBot, openaiBot: OpenaiBot,
session: IntegrationSession, session: IntegrationSession,
settings: OpenaiSetting, settings: OpenaiSetting,
content: string, content: string,
) { ) {
if (session && session.status !== 'opened') { if (session && session.status === 'closed') {
return; return;
} }
@ -1598,16 +1606,26 @@ export class OpenaiService {
}); });
} }
await this.initAssistantNewSession(instance, remoteJid, pushName, openaiBot, settings, session, content); await this.initAssistantNewSession(
instance,
remoteJid,
pushName,
fromMe,
openaiBot,
settings,
session,
content,
);
return; return;
} }
} }
if (!session) { if (!session) {
await this.initAssistantNewSession(instance, remoteJid, pushName, openaiBot, settings, session, content); await this.initAssistantNewSession(instance, remoteJid, pushName, fromMe, openaiBot, settings, session, content);
return; return;
} }
if (session.status !== 'paused')
await this.prismaRepository.integrationSession.update({ await this.prismaRepository.integrationSession.update({
where: { where: {
id: session.id, id: session.id,
@ -1670,7 +1688,7 @@ export class OpenaiService {
const threadId = session.sessionId; const threadId = session.sessionId;
const messageData: any = { const messageData: any = {
role: 'user', role: fromMe ? 'assistant' : 'user',
content: [{ type: 'text', text: content }], content: [{ type: 'text', text: content }],
}; };
@ -1691,20 +1709,16 @@ export class OpenaiService {
} }
await this.client.beta.threads.messages.create(threadId, messageData); await this.client.beta.threads.messages.create(threadId, messageData);
const contactPushName = await this.prismaRepository.contact
.findFirst({ if (fromMe || session?.status === 'paused') {
where: { sendTelemetry('/message/sendText');
remoteJid, return;
}, }
select: {
pushName: true,
},
})
.then((contact) => contact.pushName);
const runAssistant = await this.client.beta.threads.runs.create(threadId, { const runAssistant = await this.client.beta.threads.runs.create(threadId, {
assistant_id: openaiBot.assistantId, assistant_id: openaiBot.assistantId,
additional_instructions: `WhatsappApiInfo: additional_instructions: `WhatsappApiInfo:
Name: ${contactPushName} Name: ${pushName}
RemoteJid: ${remoteJid} RemoteJid: ${remoteJid}
`, `,
}); });