apexify.js 4.4.36 → 4.5.1

package/dist/index.js

@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApexImageReader = exports.ApexFileReader = exports.ApexListener = exports.validOptions = exports.ApexChat = exports.ApexImagine = exports.ApexAI = exports.ApexPainter = void 0;
+exports.ApexImageAnalyzer = exports.ApexImageReader = exports.ApexFileReader = exports.ApexListener = exports.validateModels = exports.ApexChat = exports.ApexImagine = exports.ApexAI = exports.ApexPainter = void 0;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const CYAN = "\x1b[36m";
@@ -59,15 +59,18 @@ Object.defineProperty(exports, "ApexImagine", { enumerable: true, get: function
 Object.defineProperty(exports, "ApexPainter", { enumerable: true, get: function () { return utils_1.ApexPainter; } });
 Object.defineProperty(exports, "ApexListener", { enumerable: true, get: function () { return utils_1.ApexListener; } });
 const validOptions_1 = require("./ai/functions/validOptions");
-Object.defineProperty(exports, "validOptions", { enumerable: true, get: function () { return validOptions_1.validOptions; } });
+Object.defineProperty(exports, "validateModels", { enumerable: true, get: function () { return validOptions_1.validateModels; } });
+const utils_2 = require("./ai/utils");
 __exportStar(require("./canvas/utils/utils"), exports);
 __exportStar(require("./canvas/utils/types"), exports);
 const ApexFileReader = utils_1.readFile;
 exports.ApexFileReader = ApexFileReader;
 const ApexImageReader = utils_1.imageReader;
 exports.ApexImageReader = ApexImageReader;
+const ApexImageAnalyzer = utils_2.groqAnalyzer;
+exports.ApexImageAnalyzer = ApexImageAnalyzer;
 const Apexify = {
-    ApexPainter: utils_1.ApexPainter, ApexAI: utils_1.ApexAI, ApexImagine: utils_1.ApexImagine, ApexChat: utils_1.ApexChat, validOptions: validOptions_1.validOptions, ApexListener: utils_1.ApexListener, ApexFileReader, ApexImageReader
+    ApexPainter: utils_1.ApexPainter, ApexAI: utils_1.ApexAI, ApexImagine: utils_1.ApexImagine, ApexChat: utils_1.ApexChat, validateModels: validOptions_1.validateModels, ApexListener: utils_1.ApexListener, ApexFileReader, ApexImageReader, ApexImageAnalyzer
 };
 exports.default = Apexify;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,uCAAyB;AAEzB,MAAM,IAAI,GAAW,UAAU,CAAC;AAChC,MAAM,KAAK,GAAW,SAAS,CAAC;AAEhC,MAAM,eAAe,GAAW,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;AAC5E,MAAM,WAAW,GAAQ,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;AAE9E,MAAM,iBAAiB,GAAG,UAAS,OAAe;IAC9C,MAAM,YAAY,GAAQ,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;IACzD,MAAM,eAAe,GAAQ,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;IAC/D,MAAM,OAAO,GAAW,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC;IAC5H,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,KAAK,CAAC,wDAAwD,CAAC;KAC1D,IAAI,CAAC,UAAS,QAAkB;IAC7B,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AAC3B,CAAC,CAAC;KACD,IAAI,CAAC,UAAS,IAAS;IACpB,MAAM,OAAO,GAAW,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;IAC1D,IAAI,OAAO,IAAI,iBAAiB,CAAC,YAAY,CAAC,KAAK,OAAO,EAAE,CAAC;QACzD,OAAO,CAAC,KAAK,CAAC,IAAI;YACd,yDAAyD,GAAG,OAAO,GAAG,IAAI;YAC1E,KAAK,CAAC,CAAC;IACf,CAAC;AACL,CAAC,CAAC;KACD,KAAK,CAAC,UAAS,KAAU,IAAG,CAAC,CAAC,CAAC;AAEpC,mCAA0G;AAOpF,uFAPb,cAAM,OAOa;AAAe,yFAP1B,gBAAQ,OAO0B;AAArB,4FAPH,mBAAW,OAOG;AAAhC,4FAP+B,mBAAW,OAO/B;AAA+C,6FAPd,oBAAY,OAOc;AAN/E,8DAA2D;AAMN,6FAN5C,2BAAY,OAM4C;AALjE,uDAAqC;AACrC,uDAAqC;AAErC,MAAM,cAAc,GAAG,gBAAQ,CAAC;AAEiD,wCAAc;AAD/F,MAAM,eAAe,GAAG,mBAAW,CAAA;AAC8D,0CAAe;AAEhH,MAAM,OAAO,GAAG;IACZ,WAAW,EAAX,mBAAW,EAAE,MAAM,EAAN,cAAM,EAAE,WAAW,EAAX,mBAAW,EAAE,QAAQ,EAAR,gBAAQ,EAAE,YAAY,EAAZ,2BAAY,EAAE,YAAY,EAAZ,oBAAY,EAAE,cAAc,EAAE,eAAe;CAC1G,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,uCAAyB;AAEzB,MAAM,IAAI,GAAW,UAAU,CAAC;AAChC,MAAM,KAAK,GAAW,SAAS,CAAC;AAEhC,MAAM,eAAe,GAAW,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;AAC5E,MAAM,WAAW,GAAQ,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;AAE9E,MAAM,iBAAiB,GAAG,UAAS,OAAe;IAC9C,MAAM,YAAY,GAAQ,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;IACzD,MAAM,eAAe,GAAQ,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;IAC/D,MAAM,OAAO,GAAW,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC;IAC5H,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,KAAK,CAAC,wDAAwD,CAAC;KAC1D,IAAI,CAAC,UAAS,QAAkB;IAC7B,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AAC3B,CAAC,CAAC;KACD,IAAI,CAAC,UAAS,IAAS;IACpB,MAAM,OAAO,GAAW,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;IAC1D,IAAI,OAAO,IAAI,iBAAiB,CAAC,YAAY,CAAC,KAAK,OAAO,EAAE,CAAC;QACzD,OAAO,CAAC,KAAK,CAAC,IAAI;YACd,yDAAyD,GAAG,OAAO,GAAG,IAAI;YAC1E,KAAK,CAAC,CAAC;IACf,CAAC;AACL,CAAC,CAAC;KACD,KAAK,CAAC,UAAS,KAAU,IAAG,CAAC,CAAC,CAAC;AAEpC,mCAA0G;AASpF,uFATb,cAAM,OASa;AAAe,yFAT1B,gBAAQ,OAS0B;AAArB,4FATH,mBAAW,OASG;AAAhC,4FAT+B,mBAAW,OAS/B;AAAiD,6FAThB,oBAAY,OASgB;AARjF,8DAA6D;AAQR,+FAR5C,6BAAc,OAQ4C;AAPnE,sCAA0C;AAC1C,uDAAqC;AACrC,uDAAqC;AAErC,MAAM,cAAc,GAAG,gBAAQ,CAAC;AAGmD,wCAAc;AAFjG,MAAM,eAAe,GAAG,mBAAW,CAAA;AAEgE,0CAAe;AADlH,MAAM,iBAAiB,GAAG,oBAAY,CAAA;AAC8E,8CAAiB;AAErI,MAAM,OAAO,GAAG;IACZ,WAAW,EAAX,mBAAW,EAAE,MAAM,EAAN,cAAM,EAAE,WAAW,EAAX,mBAAW,EAAE,QAAQ,EAAR,gBAAQ,EAAE,cAAc,EAAd,6BAAc,EAAE,YAAY,EAAZ,oBAAY,EAAE,cAAc,EAAE,eAAe,EAAE,iBAAiB;CAC/H,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/lib/ai/ApexAI.ts

@@ -1,18 +1,14 @@
 import { Hercai } from "hercai";
-import fs from "fs";
-import path from "path";
 import {
   imageReader,
   toDraw,
   aiImagine,
   aiVoice,
   typeWriter,
-  readImage,
-  v4,
-  openChat,
-  llamaChat,
-  mixtral,
+  groqAnalyzer,
   readFile,
+  geminiPro,
+  geminiFlash
 } from "./utils";
 import { 
   ModalBuilder,
@@ -20,28 +16,32 @@ import {
   TextInputStyle,
   ActionRowBuilder,
   Message,
-  PermissionResolvable,
-  TextChannel
+  PermissionResolvable
 } from "discord.js";
 import { filters } from "./buttons/tools";
 import { imageTools } from "./buttons/drawMenu";
-import { apexai, geminiFlash, geminiPro, facebook_ai, yi_34b, starChat } from "./modals-chat/modals";
-import { whisper } from "./modals-chat/whisper";
+import { whisper } from "./modals-chat/groq/whisper";
+import { groqChatModels, hercChatModels, otherChatModel, rsnChatModels } from "./functions/validOptions";
+import { chatHercai } from "./modals-chat/hercai/chatModels";
+import { rsnAPI } from "./modals-chat/rsn/rsnChat";
+import { otherChatModels } from "./modals-chat/others/otherModels";
+import { chatGroq } from "./modals-chat/groq/chatgroq";
+import { gpt4o } from "./modals-chat/freesedgpt/chat";
 
 export interface Options {
   /**
    * Configuration options related to voice functionality.
    * @param voice.textVoice Configuration options for text-to-voice functionality.
    * @param voice.textVoice.enable Whether text-to-voice functionality is enabled.
-   * @param voice.textVoice.voiceModal The voice modal to be used.
-   * @param voice.textVoice.voice_code The voice code only for (apexAI and zenithAI modal).
-   * @param voice.textVoice.apiKey The API key for accessing the voice service only for (apexAI and zenithAI modal).
-   * @param voice.textVoice.type The type of voice only for (apexAI and zenithAI modal).
+   * @param voice.textVoice.voiceModel The voice model to be used.
+   * @param voice.textVoice.voice_code The voice code only for (apexAI and zenithAI model).
+   * @param voice.textVoice.apiKey The API key for accessing the voice service only for (apexAI and zenithAI model).
+   * @param voice.textVoice.type The type of voice only for (apexAI and zenithAI model).
    */
   voice?: {
       textVoice?: {
           enable?: boolean;
-          voiceModal?: string;
+          voiceModel?: string;
           voice_code?: string;
           apiKey?: string;
           type?: string;
@@ -51,27 +51,32 @@ export interface Options {
    * Configuration options related to image generation.
    * @param imagine.enable Whether image generation is enabled.
    * @param imagine.drawTrigger The trigger phrases for initiating image generation.
-   * @param imagine.imageModal The modal for the image generation.
+   * @param imagine.imageModal The model for the image generation.
    * @param imagine.numOfImages The number of images to generate.
    * @param imagine.nsfw Configuration options for NSFW filtering.
    * @param imagine.nsfw.enable Whether NSFW filtering is enabled.
    * @param imagine.nsfw.keywords Keywords for NSFW filtering.
    * @param imagine.enhancer Configuration options for image enhancement.
    * @param imagine.enhancer.enable Whether image enhancement is enabled (rewrites your prompt in more descriptive way).
-   * @param imagine.enhancer.enhancerModal The modal for image enhancement only for (Prodia modals).
-   * @param imagine.enhancer.cfg_scale The scale for image enhancement only for (Prodia modals).
-   * @param imagine.enhancer.steps The number of enhancement steps only for (Prodia modals).
-   * @param imagine.enhancer.seed The seed for image enhancement only for (Prodia modals).
-   * @param imagine.enhancer.imgStyle The style of the image only for (Prodia modals).
-   * @param imagine.enhancer.negative_prompt The negative prompt for image enhancement only for (Prodia modals).
-   * @param imagine.enhancer.sampler The sampler for image enhancement only for (Prodia modals).
+   * @param imagine.enhancer.enhancerModal The model for image enhancement only for (Prodia models).
+   * @param imagine.enhancer.cfg_scale The scale for image enhancement only for (Prodia models).
+   * @param imagine.enhancer.steps The number of enhancement steps only for (Prodia models).
+   * @param imagine.enhancer.seed The seed for image enhancement only for (Prodia models).
+   * @param imagine.enhancer.imgStyle The style of the image only for (Prodia models).
+   * @param imagine.enhancer.negative_prompt The negative prompt for image enhancement only for (Prodia models).
+   * @param imagine.enhancer.sampler The sampler for image enhancement only for (Prodia models).
    */
   imagine?: {
       enable?: boolean;
       drawTrigger?: string[];
-      imageModal?: string;
+      imageModel?: string;
       numOfImages?: number;
-      imgKey?: string; 
+      ApiKeys?: {
+        groqAPI?: string;
+        rsnAPIkey?: string;
+        prodiaAPI?: string;
+        freesedGPTApi?: string;
+      }; 
       nsfw?: {
           enable?: boolean;
           keywords?: string[];
@@ -93,7 +98,7 @@ export interface Options {
   };
   /**
    * Configuration options related to chat functionality.
-   * @param chat.chatModal The chat modal to be used.
+   * @param chat.chatModel The chat model to be used.
    * @param chat.readFiles Whether to read files.
    * @param chat.readImages Whether to read images.
    * @param chat.personality The personality for the chat.
@@ -110,11 +115,18 @@ export interface Options {
   chat?: {
       enable?: boolean;
       returnChat?: Boolean
-      chatModal?: string;
+      chatModel?: string;
       readFiles?: boolean;
       readImages?: boolean;
       personality?: string | any;
-      API_KEY?: string;
+      instruction?: string;
+      Api_Keys?: {
+        groq_API?: string;
+        rsn_API?: string;
+        prodia_API?: string;
+        geminiAPI?: string;
+        freesedGPT_Api?: string;
+      }; 
       lang?: string;
       memory?: {
           memoryOn?: boolean;
@@ -197,17 +209,22 @@ export async function ApexAI (message: Message, aiOptions: Options) {
       voice: {
           textVoice: {
               enable: textVoiceEnable = false,
-              voiceModal: textVoiceModal = "google",
+              voiceModel: textVoiceModel = "google",
               voice_code: textVoiceCode = "en-US-3",
               apiKey: textVoiceApiKey = "",
               type: textVoiceType = "b"
           } = {}
       } = {},
       imagine: {
-        imgKey = 'eaebff6e-c7b2-477c-8edd-9aa91becf1e3',
+        ApiKeys: {
+          groqAPI = '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',
+          rsnAPIkey = 'rsnai_SbLbFcwdT2h2KoYet2LS0F34', 
+          prodiaAPI = 'eaebff6e-c7b2-477c-8edd-9aa91becf1e3',
+          freesedGPTApi = null
+        } = {},
         enable: imagineEnable = false,
         drawTrigger = ["create", "رسم"],
-        imageModal = "prodia",
+        imageModel = "prodia",
         numOfImages = 2,
         nsfw: {
           enable: nsfwEnabled = false,
@@ -230,11 +247,17 @@ export async function ApexAI (message: Message, aiOptions: Options) {
     } = {},
       chat: {
           enable: chatEnable = true,
-          chatModal = "v3",
+          chatModel = "v3",
           readFiles = false,
           readImages = false,
           returnChat = true,
-          API_KEY = undefined || null,
+          instruction = '',
+          Api_Keys: {
+            groq_API = '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',
+            rsn_API = 'rsnai_SbLbFcwdT2h2KoYet2LS0F34', 
+            geminiAPI = null,
+            freesedGPT_Api = null,
+          } = {},
           personality = null,
           lang = 'en',
           memory: {
@@ -320,7 +343,7 @@ export async function ApexAI (message: Message, aiOptions: Options) {
 
           if (contentType.startsWith('audio/')) {
             if (voiceSize > (25 * 1024 * 1024)) return 'Voice/Audio file uploaded has is bigger than 25MB please decrease its size and resend it.'
-          usermsg = await whisper(usermsg, url, lang)
+          usermsg += await whisper(usermsg, url, lang)
           }
         } catch (e: any) {}
       });
@@ -333,9 +356,11 @@ export async function ApexAI (message: Message, aiOptions: Options) {
       
       if (attachment && validExtensions.test(attachment?.name)) {
           if (imgURL && !readImages) {
+              usermsg += `-# This is the explanation/analyzing of image provided.\n\n`;
               usermsg += await imageReader(imgURL);
           } else if (imgURL && readImages) {
-              usermsg += await readImage(imgURL);
+              usermsg += `-# This is the explanation/analyzing of image provided.\n\n`;
+              usermsg += await groqAnalyzer({ imgURL, ApiKey: groqAPI as string, prompt: usermsg });
           }
       }
 
@@ -355,7 +380,7 @@ export async function ApexAI (message: Message, aiOptions: Options) {
     }
   }
 
-      if (aiOptions.chat && readFiles && chatModal !== ('gemini-pro' || 'gemini-flash')) {
+      if (aiOptions.chat && readFiles && chatModel !== ('gemini-pro' || 'gemini-flash')) {
          if (message.attachments?.size > 0) {
             if (attachment?.name.endsWith('.pdf')) {
                 const pdfContent = await readFile(attachment.url, 'pdf');
@@ -405,9 +430,11 @@ export async function ApexAI (message: Message, aiOptions: Options) {
   
         if (fetchedMessage.attachments && validExtensions.test(fetchedMessage.attachments.name)) {
         if (imgURL && !readImages) {
+          usermsg += `-# This is the explanation/analyzing of previously image provided.\n\n`;
           replied += await imageReader(fetchedMessage.attachments?.first().url);
         }  else if (imgURL && readImages) {
-          usermsg += await readImage(fetchedMessage.attachments?.first().url);
+          usermsg += `-# This is the explanation/analyzing of previously image provided.\n\n`;
+          usermsg += await groqAnalyzer({ imgURL, ApiKey: groqAPI as string, prompt: usermsg });
         }
       }
         usermsg = `${usermsg}\n\n Read previous message: ${replied}`;
@@ -427,7 +454,7 @@ export async function ApexAI (message: Message, aiOptions: Options) {
 
       const drawValid: any = aiOptions.imagine && imagineEnable && toDraw(usermsg, drawTrigger);
       const number = numOfImages; 
-      const modal = imageModal;
+      const model = imageModel;
 
       if (drawValid) {   
         const matchingTrigger = drawTrigger.find(trigger => usermsg.startsWith(trigger));
@@ -447,14 +474,14 @@ export async function ApexAI (message: Message, aiOptions: Options) {
           number,
           usermsg,
           hercai,
-          modal,
+          model,
           nsfwEnabled,
           nsfwKeyWords,
           deepCheck,
           aiOptions.imagine?.enhancer,
           buttons,
           RespondMessage,
-          imgKey
+          { rsnAPI: rsnAPIkey, groqAPI, prodiaAPI, freesedGPTApi: freesedGPTApi as string }
         );
 
     } else if (aiOptions.voice?.textVoice?.enable) {
@@ -466,9 +493,9 @@ export async function ApexAI (message: Message, aiOptions: Options) {
           usermsg,
           hercai,
           drawValid,
-          modal,
-          chatModal,
-          textVoiceModal,
+          model,
+          chatModel,
+          textVoiceModel,
           textVoiceCode,
           textVoiceApiKey, 
           textVoiceType,
@@ -478,7 +505,7 @@ export async function ApexAI (message: Message, aiOptions: Options) {
           aiOptions.imagine?.enhancer,
           buttons,
           RespondMessage,
-          imgKey
+          { rsnAPI: rsnAPIkey, groqAPI, prodiaAPI,  freesedGPTApi: freesedGPTApi as string}
         );
       }
  
@@ -498,24 +525,16 @@ export async function ApexAI (message: Message, aiOptions: Options) {
     }
       } else if (chatEnable) {
         try { 
-        if (chatModal === 'apexChat') {
-            response = await apexai(usermsg);
-        } else if (chatModal === 'yi-ai') { 
-            response = await yi_34b(usermsg);
-        } else if (chatModal === 'facebook-ai') { 
-            response = await facebook_ai(usermsg);
-        } else if (chatModal === 'starChat') {
-            response = await starChat(usermsg);
-        } else if (chatModal === 'v4') {
-          response = await v4({ API_KEY, prompt: usermsg });
-        } else if (chatModal === 'openChat') {
-          response = await openChat({ API_KEY, prompt: usermsg });
-        } else if (chatModal === 'llamaChat') {
-          response = await llamaChat({ API_KEY, prompt: usermsg });
-        } else if (chatModal === 'mixtral') {
-          response = await mixtral({ API_KEY, prompt: usermsg });
-        } else if (chatModal === 'gemini-flash') {
-            response = await geminiFlash(
+        if (otherChatModel.includes(chatModel)) {
+          response = await otherChatModels({ modelName: chatModel as any, prompt: usermsg });
+        } else if (rsnChatModels.includes(chatModel)) {
+          response = await rsnAPI({ API_KEY: rsn_API as string, prompt: usermsg, apiName: chatModel });
+        } else if (groqChatModels.includes(chatModel)) { 
+          response = await chatGroq({ API_KEY: groqAPI as string | undefined, prompt: usermsg, apiName: chatModel, instruction})
+        } else if (chatModel === 'gemini-flash' || chatModel === 'gemini-pro') {
+            const geminiFunction = chatModel === 'gemini-flash' ? geminiFlash : geminiPro;
+        
+            response = await geminiFunction(
               {
                   userId: message.author.id,
                   serverName: message.guild?.name as string,
@@ -527,137 +546,17 @@ export async function ApexAI (message: Message, aiOptions: Options) {
               },
               {
                   userMsg: usermsg,
-                  API_KEY: API_KEY,
+                  API_KEY: geminiAPI,
                   AiPersonality: personality
               }
             );
-        } else if (chatModal === 'gemini-pro') {
-          response = await geminiPro(
-            {
-                userId: message.author.id,
-                serverName: message.guild.name,
-                serverId: message.guild.id,
-                // @ts-ignore
-                channelName: message.channel.name,
-                attachment: attachment,
-                db: memoryOn
-            },
-            {
-                userMsg: usermsg,
-                API_KEY: API_KEY,
-                AiPersonality: personality
-            }
-          );
-        } else if (chatModal === 'v3' || chatModal === 'v3-32k' || chatModal === 'turbo' || chatModal === 'turbo-16k' || chatModal === 'gemini') {
-          if (!memoryOn) {
-
-            let personalityString = `no specific personality you are just an ai chat bot in discord server called ${message.guild.name} and speaking at channel ${message.channel.id} responding to users response who is ${message.author.username}`
-            if (personality) {
-              const personalityFilePath = path.join(process.cwd(), personality);
-              const personalityContent = fs.readFileSync(personalityFilePath, 'utf-8');
-              personalityString = personalityContent.split('\n').join(' ');
-            }
-            response = await hercai.question({
-                model: chatModal,
-                content: usermsg,
-                personality: personalityString
-            });
-            response = response.reply;
-              } else {
-                response = await hercai.betaQuestion({
-                  content: usermsg,
-                  user: memoryId
-              });
-              response = response.reply
-              }
-            } else if (chatModal === 'llama') {
-              if (!memoryOn) {
-              const personalityFilePath = path.join(process.cwd(), personality);
-              const personalityContent = fs.readFileSync(personalityFilePath, 'utf-8');
-              const personalityString = personalityContent.split('\n').join(' ');
-              response = await hercai.question({
-                model: 'llama3-70b',
-                content: usermsg,
-                personality: personalityString
-            });
-             } else {
-              response = await hercai.betaQuestion({
-              content: usermsg,
-              user: memoryId
-              });
-              response = response.reply
-             }
-            } else if (chatModal === 'llama-v2') {
-              if (!memoryOn) {
-              const personalityFilePath = path.join(process.cwd(), personality);
-              const personalityContent = fs.readFileSync(personalityFilePath, 'utf-8');
-              const personalityString = personalityContent.split('\n').join(' ');
-              response = await hercai.question({
-                model: 'llama3-8b',
-                content: usermsg,
-                personality: personalityString
-            });
-             } else {
-              response = await hercai.betaQuestion({
-              content: usermsg,
-              user: memoryId
-              });
-              response = response.reply
-             }
-            } else if (chatModal === 'gemma') {
-             if (!memoryOn) {
-              const personalityFilePath = path.join(process.cwd(), personality);
-              const personalityContent = fs.readFileSync(personalityFilePath, 'utf-8');
-              const personalityString = personalityContent.split('\n').join(' ');
-              response = await hercai.question({
-                model: 'gemma-7b',
-                content: usermsg,
-                personality: personalityString
-            });
-            } else {
-              response = await hercai.betaQuestion({
-              content: usermsg,
-              user: memoryId
-              });
-              response = response.reply
-            }
-            } else if (chatModal === 'gemma-v2') {
-              if (!memoryOn) {
-                const personalityFilePath = path.join(process.cwd(), personality);
-                const personalityContent = fs.readFileSync(personalityFilePath, 'utf-8');
-                const personalityString = personalityContent.split('\n').join(' ');
-                response = await hercai.question({
-                  model: 'gemma2-9b',
-                  content: usermsg,
-                  personality: personalityString
-              });
-              } else {
-                response = await hercai.betaQuestion({
-                content: usermsg,
-                user: memoryId
-                });
-                response = response.reply
-              }
-            } else if (chatModal === 'mixtral-v2') {
-              if (!memoryOn) {
-                const personalityFilePath = path.join(process.cwd(), personality);
-                const personalityContent = fs.readFileSync(personalityFilePath, 'utf-8');
-                const personalityString = personalityContent.split('\n').join(' ');
-                response = await hercai.question({
-                  model: 'mixtral-8x7b',
-                  content: usermsg,
-                  personality: personalityString
-              });
-              } else {
-                response = await hercai.betaQuestion({
-                content: usermsg,
-                user: memoryId
-                });
-                response = response.reply
-              }
-            } else {
-              throw new Error('Invalid chat modal. Check documentation for valid chat modals.')
-            }
+        } else if (hercChatModels.includes(chatModel)) {
+          response = await chatHercai(usermsg, chatModel as any, instruction, { enable: memoryOn, id: memoryId });
+        } else if (chatModel === 'gpt-4o') { 
+          response = await gpt4o({ ApiKey: freesedGPT_Api as string, prompt: usermsg})
+        } else {
+          throw new Error('Invalid chat model. Check documentation for valid chat models.')
+        }
         } catch (error: any) {
           if (msgType === 'reply') {
             if (error.response && error.response.status === 429) {