From 7ad96f54caf11a4771010671ad805f3df6cf1752 Mon Sep 17 00:00:00 2001 From: Davidson Gomes Date: Fri, 2 Aug 2024 19:42:54 -0300 Subject: [PATCH] fix: update typebot, openai and dify --- CHANGELOG.md | 3 +- package.json | 2 +- .../dify/services/dify.service.ts | 60 ++++++++-------- .../openai/services/openai.service.ts | 70 +++++++++---------- .../typebot/services/typebot.service.ts | 56 +++++++-------- 5 files changed, 96 insertions(+), 95 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1736bfa8..bbf0872e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 2.0.6-rc (release candidate) +# 2.0.6-rc (2024-08-02 19:23) ### Features @@ -7,6 +7,7 @@ ### Fixed * fetchInstances with clientName parameter +* fixed update typebot, openai and dify # 2.0.5-rc (2024-08-01 18:01) diff --git a/package.json b/package.json index 84c79297..ccb542fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "evolution-api", - "version": "2.0.5-rc", + "version": "2.0.6-rc", "description": "Rest api for communication with WhatsApp", "main": "./dist/src/main.js", "scripts": { diff --git a/src/api/integrations/dify/services/dify.service.ts b/src/api/integrations/dify/services/dify.service.ts index b2131c92..a78e3552 100644 --- a/src/api/integrations/dify/services/dify.service.ts +++ b/src/api/integrations/dify/services/dify.service.ts @@ -248,38 +248,38 @@ export class DifyService { if (checkDuplicate) { throw new Error('Trigger already exists'); } + } - try { - const dify = await this.prismaRepository.dify.update({ - where: { - id: difyId, - }, - data: { - enabled: data.enabled, - botType: data.botType, - apiUrl: data.apiUrl, - apiKey: data.apiKey, - expire: data.expire, - keywordFinish: data.keywordFinish, - delayMessage: data.delayMessage, - unknownMessage: data.unknownMessage, - listeningFromMe: data.listeningFromMe, - stopBotFromMe: data.stopBotFromMe, - keepOpen: data.keepOpen, - debounceTime: data.debounceTime, - instanceId: instanceId, - triggerType: data.triggerType, - triggerOperator: data.triggerOperator, - triggerValue: data.triggerValue, - ignoreJids: data.ignoreJids, - }, - }); + try { + const dify = await this.prismaRepository.dify.update({ + where: { + id: difyId, + }, + data: { + enabled: data.enabled, + botType: data.botType, + apiUrl: data.apiUrl, + apiKey: data.apiKey, + expire: data.expire, + keywordFinish: data.keywordFinish, + delayMessage: data.delayMessage, + unknownMessage: data.unknownMessage, + listeningFromMe: data.listeningFromMe, + stopBotFromMe: data.stopBotFromMe, + keepOpen: data.keepOpen, + debounceTime: data.debounceTime, + instanceId: instanceId, + triggerType: data.triggerType, + triggerOperator: data.triggerOperator, + triggerValue: data.triggerValue, + ignoreJids: data.ignoreJids, + }, + }); - return dify; - } catch (error) { - this.logger.error(error); - throw new Error('Error updating dify'); - } + return dify; + } catch (error) { + this.logger.error(error); + throw new Error('Error updating dify'); } } diff --git a/src/api/integrations/openai/services/openai.service.ts b/src/api/integrations/openai/services/openai.service.ts index 4f69fcbb..f5850cd7 100644 --- a/src/api/integrations/openai/services/openai.service.ts +++ b/src/api/integrations/openai/services/openai.service.ts @@ -394,43 +394,43 @@ export class OpenaiService { if (checkDuplicate) { throw new Error('Trigger already exists'); } + } - try { - const openaiBot = await this.prismaRepository.openaiBot.update({ - where: { - id: openaiBotId, - }, - data: { - enabled: data.enabled, - openaiCredsId: data.openaiCredsId, - botType: data.botType, - assistantId: data.assistantId, - model: data.model, - systemMessages: data.systemMessages, - assistantMessages: data.assistantMessages, - userMessages: data.userMessages, - maxTokens: data.maxTokens, - expire: data.expire, - keywordFinish: data.keywordFinish, - delayMessage: data.delayMessage, - unknownMessage: data.unknownMessage, - listeningFromMe: data.listeningFromMe, - stopBotFromMe: data.stopBotFromMe, - keepOpen: data.keepOpen, - debounceTime: data.debounceTime, - instanceId: instanceId, - triggerType: data.triggerType, - triggerOperator: data.triggerOperator, - triggerValue: data.triggerValue, - ignoreJids: data.ignoreJids, - }, - }); + try { + const openaiBot = await this.prismaRepository.openaiBot.update({ + where: { + id: openaiBotId, + }, + data: { + enabled: data.enabled, + openaiCredsId: data.openaiCredsId, + botType: data.botType, + assistantId: data.assistantId, + model: data.model, + systemMessages: data.systemMessages, + assistantMessages: data.assistantMessages, + userMessages: data.userMessages, + maxTokens: data.maxTokens, + expire: data.expire, + keywordFinish: data.keywordFinish, + delayMessage: data.delayMessage, + unknownMessage: data.unknownMessage, + listeningFromMe: data.listeningFromMe, + stopBotFromMe: data.stopBotFromMe, + keepOpen: data.keepOpen, + debounceTime: data.debounceTime, + instanceId: instanceId, + triggerType: data.triggerType, + triggerOperator: data.triggerOperator, + triggerValue: data.triggerValue, + ignoreJids: data.ignoreJids, + }, + }); - return openaiBot; - } catch (error) { - this.logger.error(error); - throw new Error('Error updating openai bot'); - } + return openaiBot; + } catch (error) { + this.logger.error(error); + throw new Error('Error updating openai bot'); } } diff --git a/src/api/integrations/typebot/services/typebot.service.ts b/src/api/integrations/typebot/services/typebot.service.ts index 75b8330b..7fcb1696 100644 --- a/src/api/integrations/typebot/services/typebot.service.ts +++ b/src/api/integrations/typebot/services/typebot.service.ts @@ -248,36 +248,36 @@ export class TypebotService { if (checkDuplicate) { throw new Error('Trigger already exists'); } + } - try { - const typebot = await this.prismaRepository.typebot.update({ - where: { - id: typebotId, - }, - data: { - enabled: data.enabled, - url: data.url, - typebot: data.typebot, - expire: data.expire, - keywordFinish: data.keywordFinish, - delayMessage: data.delayMessage, - unknownMessage: data.unknownMessage, - listeningFromMe: data.listeningFromMe, - stopBotFromMe: data.stopBotFromMe, - keepOpen: data.keepOpen, - debounceTime: data.debounceTime, - triggerType: data.triggerType, - triggerOperator: data.triggerOperator, - triggerValue: data.triggerValue, - ignoreJids: data.ignoreJids, - }, - }); + try { + const typebot = await this.prismaRepository.typebot.update({ + where: { + id: typebotId, + }, + data: { + enabled: data.enabled, + url: data.url, + typebot: data.typebot, + expire: data.expire, + keywordFinish: data.keywordFinish, + delayMessage: data.delayMessage, + unknownMessage: data.unknownMessage, + listeningFromMe: data.listeningFromMe, + stopBotFromMe: data.stopBotFromMe, + keepOpen: data.keepOpen, + debounceTime: data.debounceTime, + triggerType: data.triggerType, + triggerOperator: data.triggerOperator, + triggerValue: data.triggerValue, + ignoreJids: data.ignoreJids, + }, + }); - return typebot; - } catch (error) { - this.logger.error(error); - throw new Error('Error updating typebot'); - } + return typebot; + } catch (error) { + this.logger.error(error); + throw new Error('Error updating typebot'); } }