refactor(openai): improve service initialization and streamline audio transcription handling

- Updated OpenaiService and related classes to enhance the initialization process by ensuring the correct order of parameters.
- Simplified audio message handling by consolidating transcription logic and improving error handling.
- Refactored the OpenaiController to utilize the new structure, ensuring better integration with the base chatbot framework.
- Enhanced logging for better traceability during audio processing and API interactions.

src/api/integrations/channel/evolution/evolution.channel.service.ts

@@ -165,11 +165,7 @@ export class EvolutionStartupService extends ChannelStartupService {
             openAiDefaultSettings.speechToText &&
             received?.message?.audioMessage
           ) {
-            messageRaw.message.speechToText = await this.openaiService.speechToText(
+            messageRaw.message.speechToText = await this.openaiService.speechToText(received);
-              openAiDefaultSettings.OpenaiCreds,
-              received,
-              this.client.updateMediaMessage,
-            );
           }
         }
 

src/api/integrations/channel/meta/whatsapp.business.service.ts

@@ -501,16 +501,12 @@ export class BusinessStartupService extends ChannelStartupService {
             openAiDefaultSettings.speechToText &&
             audioMessage
           ) {
-            messageRaw.message.speechToText = await this.openaiService.speechToText(
+            messageRaw.message.speechToText = await this.openaiService.speechToText({
-              openAiDefaultSettings.OpenaiCreds,
+              message: {
-              {
+                mediaUrl: messageRaw.message.mediaUrl,
-                message: {
+                ...messageRaw,
-                  mediaUrl: messageRaw.message.mediaUrl,
-                  ...messageRaw,
-                },
               },
-              () => {},
+            });
-            );
           }
         }
 

src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts

@@ -1298,11 +1298,7 @@ export class BaileysStartupService extends ChannelStartupService {
             });
 
             if (openAiDefaultSettings && openAiDefaultSettings.openaiCredsId && openAiDefaultSettings.speechToText) {
-              messageRaw.message.speechToText = await this.openaiService.speechToText(
+              messageRaw.message.speechToText = await this.openaiService.speechToText(received);
-                openAiDefaultSettings.OpenaiCreds,
-                received,
-                this.client.updateMediaMessage,
-              );
             }
           }
 
@@ -2297,11 +2293,7 @@ export class BaileysStartupService extends ChannelStartupService {
         });
 
         if (openAiDefaultSettings && openAiDefaultSettings.openaiCredsId && openAiDefaultSettings.speechToText) {
-          messageRaw.message.speechToText = await this.openaiService.speechToText(
+          messageRaw.message.speechToText = await this.openaiService.speechToText(messageRaw);
-            openAiDefaultSettings.OpenaiCreds,
-            messageRaw,
-            this.client.updateMediaMessage,
-          );
         }
       }
 

src/api/integrations/chatbot/base-chatbot.controller.ts

@@ -47,7 +47,10 @@ export interface BaseBotData {
   [key: string]: any;
 }
 
-export abstract class BaseChatbotController<BotType = any, BotData extends BaseChatbotDto = BaseChatbotDto> extends ChatbotController implements ChatbotControllerInterface {
+export abstract class BaseChatbotController<BotType = any, BotData extends BaseChatbotDto = BaseChatbotDto>
+  extends ChatbotController
+  implements ChatbotControllerInterface
+{
   public readonly logger: Logger;
 
   integrationEnabled: boolean;
@@ -74,10 +77,7 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
   // Method to get the fallback bot ID from settings
   protected abstract getFallbackBotId(settings: any): string | undefined;
 
-  constructor(
+  constructor(prismaRepository: PrismaRepository, waMonitor: WAMonitoringService) {
-    prismaRepository: PrismaRepository,
-    waMonitor: WAMonitoringService,
-  ) {
     super(prismaRepository, waMonitor);
 
     this.sessionRepository = this.prismaRepository.integrationSession;
@@ -161,7 +161,9 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
     });
 
     if (checkTriggerAll && data.triggerType === 'all') {
-      throw new Error(`You already have a ${this.integrationName} with an "All" trigger, you cannot have more bots while it is active`);
+      throw new Error(
+        `You already have a ${this.integrationName} with an "All" trigger, you cannot have more bots while it is active`,
+      );
     }
 
     // Check for trigger keyword duplicates
@@ -336,20 +338,25 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
         // Map the specific fallback field to a generic 'fallbackId' in the response
         return {
           ...settings,
-          fallbackId: settings[fallbackFieldName]
+          fallbackId: settings[fallbackFieldName],
         };
       } else {
         const settings = await this.settingsRepository.create({
           data: {
             ...settingsData,
             instanceId: instanceId,
+            Instance: {
+              connect: {
+                id: instanceId,
+              },
+            },
           },
         });
 
         // Map the specific fallback field to a generic 'fallbackId' in the response
         return {
           ...settings,
-          fallbackId: settings[fallbackFieldName]
+          fallbackId: settings[fallbackFieldName],
         };
       }
     } catch (error) {
@@ -631,7 +638,9 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
         });
 
         if (checkTriggerAll) {
-          throw new Error(`You already have a ${this.integrationName} with an "All" trigger, you cannot have more bots while it is active`);
+          throw new Error(
+            `You already have a ${this.integrationName} with an "All" trigger, you cannot have more bots while it is active`,
+          );
         }
       }
 

src/api/integrations/chatbot/base-chatbot.service.ts

@@ -1,10 +1,10 @@
 import { InstanceDto } from '@api/dto/instance.dto';
 import { PrismaRepository } from '@api/repository/repository.service';
 import { WAMonitoringService } from '@api/services/monitor.service';
+import { Integration } from '@api/types/wa.types';
 import { ConfigService, Language } from '@config/env.config';
 import { Logger } from '@config/logger.config';
 import { IntegrationSession } from '@prisma/client';
-import { Integration } from '@api/types/wa.types';
 import axios from 'axios';
 import FormData from 'form-data';
 
@@ -119,14 +119,16 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
   public async createNewSession(instance: InstanceDto | any, data: any, type: string) {
     try {
       // Extract pushName safely - if data.pushName is an object with a pushName property, use that
-      const pushNameValue = typeof data.pushName === 'object' && data.pushName?.pushName
+      const pushNameValue =
-        ? data.pushName.pushName
+        typeof data.pushName === 'object' && data.pushName?.pushName
-        : (typeof data.pushName === 'string' ? data.pushName : null);
+          ? data.pushName.pushName
+          : typeof data.pushName === 'string'
+            ? data.pushName
+            : null;
 
       // Extract remoteJid safely
-      const remoteJidValue = typeof data.remoteJid === 'object' && data.remoteJid?.remoteJid
+      const remoteJidValue =
-        ? data.remoteJid.remoteJid
+        typeof data.remoteJid === 'object' && data.remoteJid?.remoteJid ? data.remoteJid.remoteJid : data.remoteJid;
-        : data.remoteJid;
 
       const session = await this.prismaRepository.integrationSession.create({
         data: {
@@ -206,7 +208,7 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
     instance: any,
     remoteJid: string,
     message: string,
-    settings: SettingsType
+    settings: SettingsType,
   ): Promise<void> {
     if (!message) return;
 
@@ -303,7 +305,7 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
     remoteJid: string,
     text: string,
     settings: any,
-    splitMessages: boolean
+    splitMessages: boolean,
   ): Promise<void> {
     const timePerChar = settings?.timePerChar ?? 0;
     const minDelay = 1000;
@@ -385,15 +387,18 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
     // Create a session if none exists
     if (!session) {
       // Extract pushName properly - if it's an object with pushName property, use that
-      const pushNameValue = typeof pushName === 'object' && pushName?.pushName
+      const pushNameValue =
-        ? pushName.pushName
+        typeof pushName === 'object' && pushName?.pushName
-        : (typeof pushName === 'string' ? pushName : null);
+          ? pushName.pushName
+          : typeof pushName === 'string'
+            ? pushName
+            : null;
 
       session = (
         await this.createNewSession(
           {
             instanceName: instance.instanceName,
-            instanceId: instance.instanceId 
+            instanceId: instance.instanceId,
           },
           {
             remoteJid,

src/api/integrations/chatbot/dify/controllers/dify.controller.ts

@@ -1,4 +1,3 @@
-
 import { InstanceDto } from '@api/dto/instance.dto';
 import { DifyDto } from '@api/integrations/chatbot/dify/dto/dify.dto';
 import { DifyService } from '@api/integrations/chatbot/dify/services/dify.service';

src/api/integrations/chatbot/dify/dto/dify.dto.ts

@@ -1,4 +1,5 @@
 import { $Enums, TriggerOperator, TriggerType } from '@prisma/client';
+
 import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
 
 export class DifyDto extends BaseChatbotDto {

src/api/integrations/chatbot/dify/services/dify.service.ts

@@ -2,21 +2,16 @@ import { InstanceDto } from '@api/dto/instance.dto';
 import { PrismaRepository } from '@api/repository/repository.service';
 import { WAMonitoringService } from '@api/services/monitor.service';
 import { Integration } from '@api/types/wa.types';
+import { Auth, ConfigService, HttpServer } from '@config/env.config';
 import { Dify, DifySetting, IntegrationSession } from '@prisma/client';
 import { sendTelemetry } from '@utils/sendTelemetry';
 import axios from 'axios';
 import { downloadMediaMessage } from 'baileys';
 
 import { BaseChatbotService } from '../../base-chatbot.service';
-import { ConfigService, HttpServer } from '@config/env.config';
-import { Auth } from '@config/env.config';
 
 export class DifyService extends BaseChatbotService<Dify, DifySetting> {
-  constructor(
+  constructor(waMonitor: WAMonitoringService, configService: ConfigService, prismaRepository: PrismaRepository) {
-    waMonitor: WAMonitoringService,
-    configService: ConfigService,
-    prismaRepository: PrismaRepository,
-  ) {
     super(waMonitor, prismaRepository, 'DifyService', configService);
   }
 
@@ -554,16 +549,7 @@ export class DifyService extends BaseChatbotService<Dify, DifySetting> {
           data,
         );
 
-        await this.initNewSession(
+        await this.initNewSession(instance, remoteJid, dify, settings, createSession.session, content, pushName, msg);
-          instance,
-          remoteJid,
-          dify,
-          settings,
-          createSession.session,
-          content,
-          pushName,
-          msg,
-        );
 
         await sendTelemetry('/dify/session/start');
         return;

src/api/integrations/chatbot/evoai/dto/evoai.dto.ts

@@ -1,4 +1,5 @@
 import { TriggerOperator, TriggerType } from '@prisma/client';
+
 import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
 
 export class EvoaiDto extends BaseChatbotDto {

src/api/integrations/chatbot/evoai/services/evoai.service.ts

@@ -11,11 +11,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { BaseChatbotService } from '../../base-chatbot.service';
 
 export class EvoaiService extends BaseChatbotService<Evoai, EvoaiSetting> {
-  constructor(
+  constructor(waMonitor: WAMonitoringService, prismaRepository: PrismaRepository, configService: ConfigService) {
-    waMonitor: WAMonitoringService,
-    prismaRepository: PrismaRepository,
-    configService: ConfigService,
-  ) {
     super(waMonitor, prismaRepository, 'EvoaiService', configService);
   }
 

src/api/integrations/chatbot/n8n/dto/n8n.dto.ts

@@ -1,4 +1,5 @@
 import { TriggerOperator, TriggerType } from '@prisma/client';
+
 import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
 
 export class N8nDto extends BaseChatbotDto {

src/api/integrations/chatbot/n8n/services/n8n.service.ts

@@ -11,11 +11,7 @@ import { BaseChatbotService } from '../../base-chatbot.service';
 import { N8nDto } from '../dto/n8n.dto';
 
 export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
-  constructor(
+  constructor(waMonitor: WAMonitoringService, prismaRepository: PrismaRepository, configService: ConfigService) {
-    waMonitor: WAMonitoringService,
-    prismaRepository: PrismaRepository,
-    configService: ConfigService,
-  ) {
     super(waMonitor, prismaRepository, 'N8nService', configService);
   }
 
@@ -443,16 +439,7 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
           data,
         );
 
-        await this.initNewSession(
+        await this.initNewSession(instance, remoteJid, n8n, settings, createSession.session, content, pushName, msg);
-          instance,
-          remoteJid,
-          n8n,
-          settings,
-          createSession.session,
-          content,
-          pushName,
-          msg,
-        );
 
         await sendTelemetry('/n8n/session/start');
         return;

src/api/integrations/chatbot/openai/dto/openai.dto.ts

@@ -1,15 +1,15 @@
 import { TriggerOperator, TriggerType } from '@prisma/client';
 
+import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
+
 export class OpenaiCredsDto {
   name: string;
   apiKey: string;
 }
 
-export class OpenaiDto {
+export class OpenaiDto extends BaseChatbotDto {
-  enabled?: boolean;
-  description?: string;
   openaiCredsId: string;
-  botType?: string;
+  botType: string;
   assistantId?: string;
   functionUrl?: string;
   model?: string;
@@ -17,35 +17,10 @@ export class OpenaiDto {
   assistantMessages?: string[];
   userMessages?: string[];
   maxTokens?: number;
-  expire?: number;
-  keywordFinish?: string;
-  delayMessage?: number;
-  unknownMessage?: string;
-  listeningFromMe?: boolean;
-  stopBotFromMe?: boolean;
-  keepOpen?: boolean;
-  debounceTime?: number;
-  triggerType?: TriggerType;
-  triggerOperator?: TriggerOperator;
-  triggerValue?: string;
-  ignoreJids?: any;
-  splitMessages?: boolean;
-  timePerChar?: number;
 }
 
-export class OpenaiSettingDto {
+export class OpenaiSettingDto extends BaseChatbotSettingDto {
   openaiCredsId?: string;
-  expire?: number;
-  keywordFinish?: string;
-  delayMessage?: number;
-  unknownMessage?: string;
-  listeningFromMe?: boolean;
-  stopBotFromMe?: boolean;
-  keepOpen?: boolean;
-  debounceTime?: number;
   openaiIdFallback?: string;
-  ignoreJids?: any;
   speechToText?: boolean;
-  splitMessages?: boolean;
-  timePerChar?: number;
 }

src/api/server.module.ts

@@ -119,7 +119,7 @@ export const baileysController = new BaileysController(waMonitor);
 const typebotService = new TypebotService(waMonitor, configService, prismaRepository);
 export const typebotController = new TypebotController(typebotService, prismaRepository, waMonitor);
 
-const openaiService = new OpenaiService(waMonitor, configService, prismaRepository);
+const openaiService = new OpenaiService(waMonitor, prismaRepository, configService);
 export const openaiController = new OpenaiController(openaiService, prismaRepository, waMonitor);
 
 const difyService = new DifyService(waMonitor, configService, prismaRepository);

src/api/services/channel.service.ts

@@ -47,7 +47,7 @@ export class ChannelStartupService {
 
   public typebotService = new TypebotService(waMonitor, this.configService, this.prismaRepository);
 
-  public openaiService = new OpenaiService(waMonitor, this.configService, this.prismaRepository);
+  public openaiService = new OpenaiService(waMonitor, this.prismaRepository, this.configService);
 
   public difyService = new DifyService(waMonitor, this.configService, this.prismaRepository);