apexify.js 3.3.6 → 3.3.8

package/SECURITY.md

@@ -0,0 +1,20 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| >v1.x.x | :white_check_mark: |
+| >v2.x.x | :white_check_mark: |
+| >v3.3.x | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.

package/change logs.md

@@ -5,7 +5,7 @@
 ### General Chnages
 
 - Documetation moved to [Apexify.js](http://apexify.jedi-studio.com)
-
+- Fixed minor bugs
 ### ApexAI Changes
 
 - Added custom nsfw key words filter.

package/examples/barchart.txt

@@ -14,7 +14,6 @@ const data = {
     },
     bg: {
        image: 'https://png.pngtree.com/thumb_back/fh260/background/20211118/pngtree-financial-technology-data-graph-image_908921.jpg',
-       baseDir: __dirname,
        bgColor: 'darkgray'
       }, 
     grid: {
@@ -58,7 +57,6 @@ const data = {
             'blue': 'Label 3',
             'yellow': 'Lable 4'
         },
-        keyColor: '',
         xTitle: 'X Axis Title',
         yTitle: 'Y Axis Title',
         labelStyle: {

package/examples/linechart.txt

@@ -79,13 +79,11 @@ const data = {
            lineWidth: 3, 
         },
         canvas: {
-            bgColor: 'black',
             fontColor: 'white',
             fontSize: 16,
             width: 800,
             height: 600,
             image: 'image url or path if u dont want a bg color',
-            baseDir: __dirname // need to be added if u using a local path image
         }
     }
 };

package/lib/ai/ApexAI.ts

@@ -10,12 +10,11 @@ import {
   typeWriter,
   readImage,
 } from "./utils";
-import axios from "axios";
 import { 
   ModalBuilder,
   TextInputBuilder,
   TextInputStyle,
-  ActionRowBuilder 
+  ActionRowBuilder
 } from "discord.js";
 import { filters } from "./buttons/tools";
 import { imageTools } from "./buttons/drawMenu";
@@ -406,7 +405,6 @@ export async function ApexAI (message: any, aiOptions: Options) {
                 await typeWriter(message.channel, part, speed, delay);
               }
           }
-
       } else {
           if (response.length <= 2000) {
               await message.reply({
@@ -479,106 +477,139 @@ export async function ApexAI (message: any, aiOptions: Options) {
 }
 
 export async function gemmaAi_4(prompt: string) {
-    try {
-        const response = await axios.post('https://api-inference.huggingface.co/models/google/gemma-7b-it', { inputs: prompt }, {
-            headers: { 'Authorization': `Bearer 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` }
-        });
-        return response.data[0].generated_text;
-    } catch (error: any) {
-        console.error('Error fetching response:', error.message);
-        return null;
+  try {
+    const response = await fetch('https://api-inference.huggingface.co/models/google/gemma-7b-it', {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+            'Authorization': 'Bearer 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'
+        },
+        body: JSON.stringify({ inputs: prompt })
+    });
+
+    if (!response.ok) {
+        throw new Error('Network response was not ok');
     }
+
+    const responseData = await response.json();
+    return responseData[0].generated_text;
+  } catch (error: any) {
+    console.error('Error fetching response:', error.message);
+    return null;
+  }
 }
 
 export async function gemmaAi_3(prompt: string) {
-    try {
-        const response = await axios.post('https://api-inference.huggingface.co/models/google/gemma-2b-it', { inputs: prompt }, {
-            headers: { 'Authorization': `Bearer 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` }
-        });
-        return response.data[0].generated_text;
-    } catch (error: any) {
-        console.error('Error fetching response:', error.message);
-        return null;
-    }
-}
+  try {
+      const response = await fetch('https://api-inference.huggingface.co/models/google/gemma-2b-it', {
+          method: 'POST',
+          headers: {
+              'Content-Type': 'application/json',
+              'Authorization': 'Bearer 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'
+          },
+          body: JSON.stringify({ inputs: prompt })
+      });
+
+      if (!response.ok) {
+          throw new Error('Network response was not ok');
+      }
 
+      const responseData = await response.json();
+      return responseData[0].generated_text;
+  } catch (error: any) {
+      console.error('Error fetching response:', error.message);
+      return null;
+  }
+}
 export async function apexai(prompt: string) {
-    try {
+  try {
       const messages = [
-        {"role": "user", "content": `${prompt}`}
+          {"role": "user", "content": `${prompt}`}
       ];
-        const formattedMessages = messages.map(message => `[${message.role}] ${message.content}`).join('\n');
-
-        const response = await axios.post(`https://api-inference.huggingface.co/models/mistralai/Mixtral-8x7B-Instruct-v0.1`, {
-            inputs: formattedMessages
-        }, {
-            headers: {
-                'Authorization': `Bearer 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`,
-                'Content-Type': 'application/json'
-            }
-        });
-
-        const generatedText = response.data[0].generated_text;
+      const formattedMessages = messages.map(message => `[${message.role}] ${message.content}`).join('\n');
+
+      const response = await fetch('https://api-inference.huggingface.co/models/mistralai/Mixtral-8x7B-Instruct-v0.1', {
+          method: 'POST',
+          headers: {
+              'Authorization': 'Bearer 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',
+              'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({ inputs: formattedMessages })
+      });
 
-        const lines = generatedText.split('\n').slice(1);
+      if (!response.ok) {
+          throw new Error('Network response was not ok');
+      }
 
-        const output = lines.join('\n');
+      const responseData = await response.json();
+      const generatedText = responseData[0].generated_text;
+      const lines = generatedText.split('\n').slice(1);
+      const output = lines.join('\n');
 
-     return output
-    } catch (error: any) {
-      console.error('Error:', error.response.data);
-      return 'Please wait i am on cooldown.'
-    }
+      return output;
+  } catch (error: any) {
+      console.error('Error:', error.message);
+      return 'Please wait i am on cooldown.';
+  }
 }
 
 export async function starChat(prompt: string) {
-  const messages = [{"role":"user","content": `${prompt}`}]
-  
-    try {
-        const response = await axios.post('https://api-inference.huggingface.co/models/HuggingFaceH4/starchat2-15b-v0.1', {
-            inputs: JSON.stringify(messages), 
-        }, {
-            headers: {
-                'Authorization': `Bearer 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`,
-            },
-        });
+  const messages = [{"role":"user","content": `${prompt}`}];
+
+  try {
+      const response = await fetch('https://api-inference.huggingface.co/models/HuggingFaceH4/starchat2-15b-v0.1', {
+          method: 'POST',
+          headers: {
+              'Authorization': 'Bearer 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',
+              'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({ inputs: messages })
+      });
 
-        const chatbotReply = response.data[0];
-        const chatbotResponseText = chatbotReply.generated_text.replace(/^.*?\n.*?\n/, '');
-        const chatbotResponseArray = JSON.parse(chatbotResponseText);
-        const chatbotResponseString = chatbotResponseArray.join(' ');
+      if (!response.ok) {
+          throw new Error('Network response was not ok');
+      }
 
-        return chatbotResponseString;
-    } catch (error: any) {
-        console.error('Error fetching response:', error.message);
-        return null;
-    }
+      const responseData = await response.json();
+      const chatbotReply = responseData[0];
+      const chatbotResponseText = chatbotReply.generated_text.replace(/^.*?\n.*?\n/, '');
+      const chatbotResponseArray = JSON.parse(chatbotResponseText);
+      const chatbotResponseString = chatbotResponseArray.join(' ');
+
+      return chatbotResponseString;
+  } catch (error: any) {
+      console.error('Error:', error.message);
+      return null;
+  }
 }
 
 export async function zephyr_beta(prompt: string) {
+  const messages = [{"role":"user","content": `${prompt}` }];
+
+  try {
+      const response = await fetch('https://api-inference.huggingface.co/models/HuggingFaceH4/zephyr-7b-beta', {
+          method: 'POST',
+          headers: {
+              'Authorization': 'Bearer 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',
+              'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({ inputs: messages })
+      });
 
-  const messages = [{"role":"user","content": `${prompt}` }]
-    try {
-        const response = await axios.post('https://api-inference.huggingface.co/models/HuggingFaceH4/zephyr-7b-beta', {
-            inputs: JSON.stringify(messages), 
-        }, {
-            headers: {
-                'Authorization': `Bearer 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`,
-            },
-        });
-
-        const chatbotReply = response.data[0];
-
-        const textParts = chatbotReply.generated_text.split('\n');
-
-        const secondArrayString = textParts[2];
-        const chatbotResponseArray = JSON.parse(secondArrayString);
-
-        const chatbotResponseString = chatbotResponseArray.map((obj: any) => obj.content).join(' ');
+      if (!response.ok) {
+          throw new Error('Network response was not ok');
+      }
 
-        return chatbotResponseString;
-    } catch (error: any) {
-        console.error('Error fetching response:', error.message);
-        return null;
-    }
-}
+      const responseData = await response.json();
+      const chatbotReply = responseData[0];
+      const textParts = chatbotReply.generated_text.split('\n');
+      const secondArrayString = textParts[2];
+      const chatbotResponseArray = JSON.parse(secondArrayString);
+      const chatbotResponseString = chatbotResponseArray.map((obj: any) => obj.content).join(' ');
+
+      return chatbotResponseString;
+  } catch (error: any) {
+      console.error('Error:', error.message);
+      return null;
+  }
+}

package/lib/ai/functions/draw.ts

@@ -1,7 +1,6 @@
 import translate from "@iamtraction/google-translate";
 import sharp from "sharp";
 import { ButtonBuilder, StringSelectMenuBuilder, StringSelectMenuOptionBuilder, ButtonStyle, ActionRowBuilder, AttachmentBuilder, AttachmentData } from "discord.js";
-import axios from "axios";
 import api from "api";
 
 const sdk: any = api("@prodia/v1.3.0#be019b2kls0gqss3"); 
@@ -88,8 +87,8 @@ async function aiImagine(
   nsfw: boolean,
   nsfwKeyWords: string[],
 ) {
-  const maxRetryAttempts = 4;
-  const retryInterval = 5000;
+  const maxRetryAttempts = 3;
+  const retryInterval = 10000;
   let response: any;
   async function retry(fn: any, retriesLeft = maxRetryAttempts) {
     try {
@@ -98,7 +97,6 @@ async function aiImagine(
       if (retriesLeft === 0) {
         throw error;
       }
-
       await new Promise((resolve) => setTimeout(resolve, retryInterval));
       return retry(fn, retriesLeft - 1);
     }
@@ -161,38 +159,45 @@ async function aiImagine(
       let buffferedImage: any;
 
       if (imageModel === "v3") {
-        const res = await retry(() =>
-          axios.get(response.url, {
-            responseType: "arraybuffer",
-          }),
-        );
-
+        const res = await retry(async () => {
+            const resp = await fetch(response.url, {
+                method: 'GET',
+                headers: {
+                    'Content-Type': 'application/octet-stream'
+                }
+            });
+            if (!resp.ok) {
+                throw new Error("Failed to fetch image data.");
+            }
+            return await resp.arrayBuffer();
+        });
+    
         await message.channel?.sendTyping();
-
-        buffferedImage = Buffer.from(res.data, "binary");
-
+    
+        buffferedImage = Buffer.from(res, "binary");
+    
         const resizedImage = await sharp(buffferedImage)
-          .resize({
-            width: 0x320,
-          })
-          .toBuffer();
-
+            .resize({
+                width: 0x320,
+            })
+            .toBuffer();
+    
         const attachment = {
-          file: resizedImage,
-          name: `image_${_0x4d7fb6 + 1}.png`,
+            file: resizedImage,
+            name: `image_${_0x4d7fb6 + 1}.png`,
         } as AttachmentData;
-
+    
         attachData.push(attachment);
-
+    
         const urlButton = new ButtonBuilder()
-          .setStyle(ButtonStyle.Link)
-          .setLabel(`Image ${_0x4d7fb6 + 1}`)
-          .setURL(response.url);
-
+            .setStyle(ButtonStyle.Link)
+            .setLabel(`Image ${_0x4d7fb6 + 1}`)
+            .setURL(response.url);
+    
         buttonsRow1.push(urlButton);
-
+    
         imageUrls.push(response.url);
-      } else {
+    } else {
         const imageUrl = response.url || response;
 
         await message.channel?.sendTyping();
@@ -387,51 +392,44 @@ async function checkJobStatus(jobId: number | string | any) {
 
 async function attemptImageCaptioning(imageUrl: string) {
   try {
-    let retryCount = 0;
-    const maxRetries = 3;
-
-    const fetchData = async () => {
-      try {
-        const response = await axios.post(
-          `https://api-inference.huggingface.co/models/Salesforce/blip-image-captioning-base`,
-          { image: imageUrl },
-          {
-            headers: {
-              "Content-Type": "application/json",
-              Authorization: `Bearer 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`,
-            },
-          },
-        );
-
-        if (response.status === 200) {
-          return response.data[0].generated_text;
-        } else {
-          console.error(
-            `Failed to fetch image captioning API: ${response.statusText}`,
-          );
-          return null;
-        }
-      } catch (error: any) {
-        console.error(`Error fetching data: ${error.message}`);
-        throw error;
-      }
-    };
+      let retryCount = 0;
+      const maxRetries = 3;
+
+      const fetchData = async () => {
+          try {
+              const response = await fetch(`https://api-inference.huggingface.co/models/Salesforce/blip-image-captioning-base`, {
+                  method: 'POST',
+                  headers: {
+                      "Content-Type": "application/json",
+                      Authorization: `Bearer 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`,
+                  },
+                  body: JSON.stringify({ image: imageUrl })
+              });
+
+              if (response.ok) {
+                  return await response.json();
+              } else {
+                  console.error(`Failed to fetch image captioning API: ${response.statusText}`);
+                  return null;
+              }
+          } catch (error: any) {
+              console.error(`Error fetching data: ${error.message}`);
+              throw error;
+          }
+      };
 
-    while (retryCount < maxRetries) {
-      try {
-        return await fetchData();
-      } catch (error: any) {
-        console.error(
-          `Error fetching data (Retry ${retryCount + 1}): ${error.message}`,
-        );
-        retryCount++;
+      while (retryCount < maxRetries) {
+          try {
+              return await fetchData();
+          } catch (error: any) {
+              retryCount++;
+          }
       }
-    }
 
-    return null;
+      return null;
   } catch (error: any) {
-    console.error(`Error in attemptImageCaptioning: ${error.message}`);
-    return null;
+      console.error(`Error in attemptImageCaptioning: ${error.message}`);
+      return null;
   }
 }
 

package/lib/ai/functions/generateVoiceResponse.ts

@@ -1,6 +1,5 @@
 import { Hercai } from "hercai";
-import translate  from "@iamtraction/google-translate";
-import axios from "axios";
+import translate from "@iamtraction/google-translate";
 import { createWorker, recognize } from "tesseract.js";
 import { chunkString } from "./chunkString";
 import { aiImagine } from "./draw";
@@ -8,7 +7,7 @@ import fs from "fs";
 
 const herc = new Hercai();
 let isProcessing = false;
-type ChatModelOption = "v3" | "v3-32k" | "turbo" | "turbo-16k" | "gemini" ;
+type ChatModelOption = "v3" | "v3-32k" | "turbo" | "turbo-16k" | "gemini";
 
 async function aiVoice(
   message: any,
@@ -68,20 +67,16 @@ async function aiVoice(
         setTimeout(async () => {
           const encodedChunk = encodeURIComponent(chunk);
           const url = `https://translate.google.com/translate_tts?ie=UTF-8&tl=en&client=tw-ob&q=${encodedChunk}`;
-          const mp3Stream = await axios.get(url, {
-            responseType: "stream",
+          const response = await fetch(url, {
             headers: {
               Referer: "http://translate.google.com/",
               "User-Agent": "stagefright/1.2 (Linux;Android 5.0)",
             },
           });
+          const blob = await response.blob();
+          const file = new File([blob], "respond.mp3");
           await message.reply({
-            files: [
-              {
-                attachment: mp3Stream.data,
-                name: "respond.mp3",
-              },
-            ],
+            files: [file],
             allowedMentions: { repliedUser: false },
           });
         }, delay);
@@ -94,13 +89,12 @@ async function aiVoice(
 
       const options = {
         method: "POST",
-        url: "https://text-to-speech-neural-google.p.rapidapi.com/generateAudioFiles",
         headers: {
           "content-type": "application/json",
           "X-RapidAPI-Key": apiKey,
           "X-RapidAPI-Host": "text-to-speech-neural-google.p.rapidapi.com",
         },
-        data: {
+        body: JSON.stringify({
           audioFormat: "ogg",
           paragraphChunks: [msg],
           voiceParams: {
@@ -108,13 +102,13 @@ async function aiVoice(
             engine: "google",
             languageCode: "en-US",
           },
-        },
+        }),
       };
 
       try {
-        const response = await axios.request(options);
-        const audioData = response.data.audioStream;
-        fs.writeFileSync("output.ogg", Buffer.from(audioData, "base64"));
+        const response = await fetch("https://text-to-speech-neural-google.p.rapidapi.com/generateAudioFiles", options);
+        const audioData = await response.json();
+        fs.writeFileSync("output.ogg", Buffer.from(audioData.audioStream, "base64"));
         await message.reply({
           files: [
             {
@@ -142,19 +136,18 @@ async function aiVoice(
 
       const options = {
         method: "POST",
-        url: "https://cloudlabs-text-to-speech.p.rapidapi.com/synthesize",
         headers: {
           "content-type": "application/x-www-form-urlencoded",
           "X-RapidAPI-Key": apiKey,
           "X-RapidAPI-Host": "cloudlabs-text-to-speech.p.rapidapi.com",
         },
-        data: encodedParams,
+        body: encodedParams.toString(),
       };
 
       try {
-        const response = await axios.request(options);
-        const audioUrl = response.data.result.audio_url;
-        await message.reply(audioUrl, {
+        const response = await fetch("https://cloudlabs-text-to-speech.p.rapidapi.com/synthesize", options);
+        const { result: { audio_url } } = await response.json();
+        await message.reply(audio_url, {
           allowedMentions: { repliedUser: false },
         });
       } catch (error) {

package/lib/ai/functions/readImagess.ts

@@ -1,5 +1,3 @@
-import axios from "axios";
-
 export async function readImage(imageUrl: string) {
     try {
         let retryCount = 0;
@@ -7,15 +5,17 @@ export async function readImage(imageUrl: string) {
 
         const fetchData = async () => {
             try {
-                const response = await axios.post("https://api-inference.huggingface.co/models/Salesforce/blip-image-captioning-large", { image: imageUrl }, {
+                const response = await fetch("https://api-inference.huggingface.co/models/Salesforce/blip-image-captioning-large", {
+                    method: 'POST',
                     headers: {
                         "Content-Type": "application/json",
                         Authorization: "Bearer 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",
                     },
+                    body: JSON.stringify({ image: imageUrl })
                 });
 
-                if (response.status === 200) {
-                    return response.data[0].generated_text;
+                if (response.ok) {
+                    return await response.json();
                 } else {
                     return null;
                 }
@@ -27,7 +27,7 @@ export async function readImage(imageUrl: string) {
         while (retryCount < maxRetries) {
             try {
                 return await fetchData();
-            } catch (error: any) {
+            } catch (error) {
                 retryCount++;
                 console.error(`Error fetching data (Retry ${retryCount}): ${error}`);
             }

package/lib/ai/functions/typeWriter.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 export async function typeWriter(channel: any, sentence: string, speed: number, delay: number): Promise<void> {
     const typingMessage = await channel.send(sentence[0]);
     let typedSentence = typingMessage.content;