apexify.js 2.2.2 → 2.3.0

package/lib/ai/apexAI.js

@@ -41,29 +41,14 @@ var hercai_1 = require("hercai");
 var utils_1 = require("./utils");
 var axios_1 = require("axios");
 var discord_js_1 = require("discord.js");
-var tools_1 = require("../discord/events/tools");
-var drawMenu_1 = require("../discord/events/drawMenu");
+var tools_1 = require("../discord/events/handler/tools");
+var drawMenu_1 = require("../discord/events/handler/drawMenu");
 var hercai = new hercai_1.Hercai();
-var unclearPhrases = [
-    "Can you please provide more information or clarify your question?",
-    "Could you please provide more context or clarify your question?",
-    "Could you please provide more context or clarify what you mean?",
-    "I'm not sure I understand the question.",
-    "Could you please provide more context or clarify your question",
-    "I'm not sure what you're asking for.",
-    "Could you please provide more context or rephrase your question?",
-    "I'm not sure what you're asking",
-    "Can you please rephrase or provide more context?",
-    "Could you please provide more context or clarify your request?",
-    "I couldn't understand your input",
-    "Could you please provide some more information or clarify what you mean?",
-    "Can you please provide more information or clarify your request?",
-];
 function apexAI(message, options) {
-    var _a, _b, _c;
+    var _a, _b;
     if (options === void 0) { options = {}; }
     return __awaiter(this, void 0, void 0, function () {
-        var _d, voice, _e, voiceModel, _f, voice_code, _g, apiKey, _h, type, _j, draw, _k, drawTrigger, _l, imageModel, _m, numOfImages, _o, chatModel, _p, keywords, _q, keywordResponses, _r, loader, _s, readFiles, _t, nsfw, _u, enhancer, loadingMessage, loadingTimer_1, combinedText, _v, attachment, pdfContent, txtContent, replied, fetchedMessage, _w, finalText, response, textEnhancer, _i, keywords_1, keyword, textToDraw, drawValid, error_1, imageUrl, imageCaption, parts, _x, parts_1, part, error_2;
+        var _c, voice, _d, voiceModel, _e, voice_code, _f, apiKey, _g, type, _h, draw, _j, drawTrigger, _k, imageModel, _l, numOfImages, _m, chatModel, _o, keywords, _p, keywordResponses, _q, loader, _r, readFiles, _s, nsfw, _t, enhancer, loadingMessage, loadingTimer_1, combinedText, _u, attachment, pdfContent, txtContent, replied, fetchedMessage, _v, finalText, response, textEnhancer, _i, keywords_1, keyword, textToDraw, drawValid, error_1, parts, _w, parts_1, part, parts, _x, parts_2, part, error_2;
         return __generator(this, function (_y) {
             switch (_y.label) {
                 case 0:
@@ -78,11 +63,11 @@ function apexAI(message, options) {
                     _y.sent();
                     _y.label = 3;
                 case 3:
-                    _y.trys.push([3, 45, , 46]);
-                    _d = options.voice, voice = _d === void 0 ? false : _d, _e = options.voiceModel, voiceModel = _e === void 0 ? "google" : _e, _f = options.voice_code, voice_code = _f === void 0 ? "en-US-3" : _f, _g = options.apiKey, apiKey = _g === void 0 ? "" : _g, _h = options.type, type = _h === void 0 ? "b" : _h, _j = options.draw, draw = _j === void 0 ? false : _j, _k = options.drawTrigger, drawTrigger = _k === void 0 ? ["create", "رسم"] : _k, _l = options.imageModel, imageModel = _l === void 0 ? "prodia" : _l, _m = options.numOfImages, numOfImages = _m === void 0 ? 2 : _m, _o = options.chatModel, chatModel = _o === void 0 ? "v3" : _o, _p = options.keywords, keywords = _p === void 0 ? [] : _p, _q = options.keywordResponses, keywordResponses = _q === void 0 ? {} : _q, _r = options.loader, loader = _r === void 0 ? {
+                    _y.trys.push([3, 50, , 51]);
+                    _c = options.voice, voice = _c === void 0 ? false : _c, _d = options.voiceModel, voiceModel = _d === void 0 ? "google" : _d, _e = options.voice_code, voice_code = _e === void 0 ? "en-US-3" : _e, _f = options.apiKey, apiKey = _f === void 0 ? "" : _f, _g = options.type, type = _g === void 0 ? "b" : _g, _h = options.draw, draw = _h === void 0 ? false : _h, _j = options.drawTrigger, drawTrigger = _j === void 0 ? ["create", "رسم"] : _j, _k = options.imageModel, imageModel = _k === void 0 ? "prodia" : _k, _l = options.numOfImages, numOfImages = _l === void 0 ? 2 : _l, _m = options.chatModel, chatModel = _m === void 0 ? "v3" : _m, _o = options.keywords, keywords = _o === void 0 ? [] : _o, _p = options.keywordResponses, keywordResponses = _p === void 0 ? {} : _p, _q = options.loader, loader = _q === void 0 ? {
                         loadingMessage: 'loading...',
                         loadingTimer: 3000
-                    } : _r, _s = options.readFiles, readFiles = _s === void 0 ? false : _s, _t = options.nsfw, nsfw = _t === void 0 ? false : _t, _u = options.enhancer, enhancer = _u === void 0 ? false : _u;
+                    } : _q, _r = options.readFiles, readFiles = _r === void 0 ? false : _r, _s = options.nsfw, nsfw = _s === void 0 ? false : _s, _t = options.enhancer, enhancer = _t === void 0 ? false : _t;
                     if (!message.attachments.some(function (attachment) {
                         return attachment.contentType.startsWith("audio/");
                     })) return [3 /*break*/, 5];
@@ -99,7 +84,7 @@ function apexAI(message, options) {
                         }).then(function (replyMessage) {
                             setTimeout(function () {
                                 replyMessage.delete().catch(console.error);
-                            }, loadingTimer_1);
+                            }, loadingTimer_1 || 3000);
                         })];
                 case 6:
                     _y.sent();
@@ -107,10 +92,10 @@ function apexAI(message, options) {
                 case 7: return [4 /*yield*/, (0, utils_1.processMessageContent)(message.content)];
                 case 8:
                     combinedText = _y.sent();
-                    _v = combinedText;
+                    _u = combinedText;
                     return [4 /*yield*/, (0, utils_1.processImageAttachments)(message.attachments)];
                 case 9:
-                    combinedText = _v + _y.sent();
+                    combinedText = _u + _y.sent();
                     if (!!combinedText) return [3 /*break*/, 11];
                     return [4 /*yield*/, message.reply({ content: "Please provide a message or an attachment." })];
                 case 10: return [2 /*return*/, _y.sent()];
@@ -145,10 +130,10 @@ function apexAI(message, options) {
                         replied += fetchedMessage.content;
                     }
                     if (!fetchedMessage.attachments) return [3 /*break*/, 19];
-                    _w = replied;
+                    _v = replied;
                     return [4 /*yield*/, (0, utils_1.processImageAttachments)(fetchedMessage.attachments)];
                 case 18:
-                    replied = _w + _y.sent();
+                    replied = _v + _y.sent();
                     _y.label = 19;
                 case 19:
                     finalText = "".concat(combinedText, "\n\n").concat(replied);
@@ -214,131 +199,82 @@ function apexAI(message, options) {
                     throw new Error("The Api is on a cool down for 10 seconds");
                 case 35: return [3 /*break*/, 36];
                 case 36:
-                    if (!containsUnclearPhrases(response.reply)) return [3 /*break*/, 38];
-                    console.log("The response appears to be random or unclear!");
-                    imageUrl = (_c = message.attachments.first()) === null || _c === void 0 ? void 0 : _c.url;
-                    if (!imageUrl) {
-                        console.error("No image attachment found.");
-                        return [2 /*return*/];
-                    }
-                    return [4 /*yield*/, attemptImageCaptioning(imageUrl)];
+                    if (!(typeof response === 'string')) return [3 /*break*/, 43];
+                    if (!(response.length <= 2000)) return [3 /*break*/, 38];
+                    return [4 /*yield*/, message.reply({
+                            content: response,
+                            allowedMentions: { repliedUser: false },
+                        })];
                 case 37:
-                    imageCaption = _y.sent();
-                    if (imageCaption) {
-                        response.reply = imageCaption + response.reply;
-                    }
-                    _y.label = 38;
+                    _y.sent();
+                    return [3 /*break*/, 42];
                 case 38:
-                    if (!(response.reply.length <= 2000)) return [3 /*break*/, 40];
+                    parts = [];
+                    while (response.length > 0) {
+                        parts.push(response.substring(0, 1999));
+                        response = response.substring(1999);
+                    }
+                    _w = 0, parts_1 = parts;
+                    _y.label = 39;
+                case 39:
+                    if (!(_w < parts_1.length)) return [3 /*break*/, 42];
+                    part = parts_1[_w];
+                    return [4 /*yield*/, message.reply({
+                            content: part,
+                            allowedMentions: { repliedUser: false },
+                        })];
+                case 40:
+                    _y.sent();
+                    _y.label = 41;
+                case 41:
+                    _w++;
+                    return [3 /*break*/, 39];
+                case 42: return [3 /*break*/, 49];
+                case 43:
+                    if (!(typeof response === 'object' && response.reply)) return [3 /*break*/, 49];
+                    if (!(response.reply.length <= 2000)) return [3 /*break*/, 45];
                     return [4 /*yield*/, message.reply({
                             content: response.reply,
                             allowedMentions: { repliedUser: false },
                         })];
-                case 39:
+                case 44:
                     _y.sent();
-                    return [3 /*break*/, 44];
-                case 40:
+                    return [3 /*break*/, 49];
+                case 45:
                     parts = [];
                     while (response.reply.length > 0) {
                         parts.push(response.reply.substring(0, 1999));
                         response.reply = response.reply.substring(1999);
                     }
-                    _x = 0, parts_1 = parts;
-                    _y.label = 41;
-                case 41:
-                    if (!(_x < parts_1.length)) return [3 /*break*/, 44];
-                    part = parts_1[_x];
+                    _x = 0, parts_2 = parts;
+                    _y.label = 46;
+                case 46:
+                    if (!(_x < parts_2.length)) return [3 /*break*/, 49];
+                    part = parts_2[_x];
                     return [4 /*yield*/, message.reply({
                             content: part,
                             allowedMentions: { repliedUser: false },
                         })];
-                case 42:
+                case 47:
                     _y.sent();
-                    _y.label = 43;
-                case 43:
+                    _y.label = 48;
+                case 48:
                     _x++;
-                    return [3 /*break*/, 41];
-                case 44: return [3 /*break*/, 46];
-                case 45:
+                    return [3 /*break*/, 46];
+                case 49: return [3 /*break*/, 51];
+                case 50:
                     error_2 = _y.sent();
                     console.error("Error processing message in file");
                     throw error_2;
-                case 46: return [2 /*return*/];
+                case 51: return [2 /*return*/];
             }
         });
     });
 }
 exports.apexAI = apexAI;
-function containsUnclearPhrases(text) {
-    return unclearPhrases.some(function (phrase) { return text.includes(phrase); });
-}
-function attemptImageCaptioning(imageUrl) {
-    return __awaiter(this, void 0, void 0, function () {
-        var retryCount, maxRetries, fetchData, error_3, error_4;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 7, , 8]);
-                    retryCount = 0;
-                    maxRetries = 3;
-                    fetchData = function () { return __awaiter(_this, void 0, void 0, function () {
-                        var response, error_5;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    _a.trys.push([0, 2, , 3]);
-                                    return [4 /*yield*/, axios_1.default.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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",
-                                            },
-                                        })];
-                                case 1:
-                                    response = _a.sent();
-                                    if (response.status === 200) {
-                                        return [2 /*return*/, response.data[0].generated_text];
-                                    }
-                                    else {
-                                        console.error("Failed to fetch image captioning API: ".concat(response.statusText));
-                                        return [2 /*return*/, null];
-                                    }
-                                    return [3 /*break*/, 3];
-                                case 2:
-                                    error_5 = _a.sent();
-                                    console.error("Error fetching data: ".concat(error_5.message));
-                                    throw error_5;
-                                case 3: return [2 /*return*/];
-                            }
-                        });
-                    }); };
-                    _a.label = 1;
-                case 1:
-                    if (!(retryCount < maxRetries)) return [3 /*break*/, 6];
-                    _a.label = 2;
-                case 2:
-                    _a.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, fetchData()];
-                case 3: return [2 /*return*/, _a.sent()];
-                case 4:
-                    error_3 = _a.sent();
-                    console.error("Error fetching data (Retry ".concat(retryCount + 1, "): ").concat(error_3.message));
-                    retryCount++;
-                    return [3 /*break*/, 5];
-                case 5: return [3 /*break*/, 1];
-                case 6: return [2 /*return*/, null];
-                case 7:
-                    error_4 = _a.sent();
-                    console.error("Error in attemptImageCaptioning: ".concat(error_4.message));
-                    return [2 /*return*/, null];
-                case 8: return [2 /*return*/];
-            }
-        });
-    });
-}
 function apexai(prompt) {
     return __awaiter(this, void 0, void 0, function () {
-        var messages, formattedMessages, response, generatedText, lines, output, error_6;
+        var messages, formattedMessages, response, generatedText, lines, output, error_3;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -347,7 +283,7 @@ function apexai(prompt) {
                         { "role": "user", "content": "".concat(prompt) }
                     ];
                     formattedMessages = messages.map(function (message) { return "[".concat(message.role, "] ").concat(message.content); }).join('\n');
-                    return [4 /*yield*/, axios_1.default.post("https://api-inference.huggingface.co/models/mistralai/Mixtral-8x7B-Instruct-v0.1", {
+                    return [4 /*yield*/, axios_1.post("https://api-inference.huggingface.co/models/mistralai/Mixtral-8x7B-Instruct-v0.1", {
                             inputs: formattedMessages
                         }, {
                             headers: {
@@ -362,8 +298,8 @@ function apexai(prompt) {
                     output = lines.join('\n');
                     return [2 /*return*/, output];
                 case 2:
-                    error_6 = _a.sent();
-                    console.error('Error:', error_6.response.data);
+                    error_3 = _a.sent();
+                    console.error('Error:', error_3.response.data);
                     return [2 /*return*/, 'Please wait i am on cooldown.'];
                 case 3: return [2 /*return*/];
             }

package/lib/ai/functions/draw.js

@@ -165,7 +165,7 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                         throw new Error("Number of images can't be greater than 4 or smaller than 0.");
                     }
                     return [4 /*yield*/, retry(function () {
-                            return (0, google_translate_1.default)(_0x28baff, {
+                            return (0, google_translate_1)(_0x28baff, {
                                 from: "auto",
                                 to: "en",
                             });
@@ -224,7 +224,7 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                                     _0x279cfe = void 0;
                                     if (!(_0x182d15 === "v3")) return [3 /*break*/, 15];
                                     return [4 /*yield*/, retry(function () {
-                                            return axios_1.default.get(_0x59b128.url, {
+                                            return axios_1.get(_0x59b128.url, {
                                                 responseType: "arraybuffer",
                                             });
                                         })];
@@ -338,7 +338,7 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                                         "ass",
                                     ];
                                     if (nsfwWords.some(function (word) { return textToCheck_1.includes(word); })) {
-                                        _0x2f79ae.reply("Warning ⚠️. The generated image contatining nsfw content. Turn off nsfw to sedn nsfw images.");
+                                       return _0x2f79ae.reply("Warning ⚠️. The generated image contatining nsfw content. Turn off nsfw to send nsfw images.");
                                     }
                                     _c.label = 17;
                                 case 17:
@@ -398,7 +398,7 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                         .setStyle(discord_js_1.ButtonStyle.Primary)
                         .setLabel("Redraw")
                         .setCustomId("redraw_button");
-                    row1 = (_a = new discord_js_1.ActionRowBuilder()).addComponents.apply(_a, __spreadArray(__spreadArray([], buttonsRow1, false), [redrawButton], false));
+                    row1 = (_a = new discord_js_1.ActionRowBuilder()).addComponents.apply(_a, __spreadArray(__spreadArray([], buttonsRow1, false)));
                     row2 = new discord_js_1.ActionRowBuilder().addComponents(selectMenu_1);
                     return [4 /*yield*/, _0x2f79ae.reply({
                             files: _0x168f75,
@@ -477,7 +477,7 @@ function attemptImageCaptioning(imageUrl) {
                             switch (_a.label) {
                                 case 0:
                                     _a.trys.push([0, 2, , 3]);
-                                    return [4 /*yield*/, axios_1.default.post("https://api-inference.huggingface.co/models/Salesforce/blip-image-captioning-base", { image: imageUrl }, {
+                                    return [4 /*yield*/, axios_1.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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",

package/lib/ai/models.js

@@ -40,7 +40,7 @@ exports.ApexChat = exports.ApexImagine = void 0;
 var hercai_1 = require("hercai");
 var axios_1 = require("axios");
 var api_1 = require("api");
-var sdk = (0, api_1.default)("@prodia/v1.3.0#be019b2kls0gqss3");
+var sdk = (0, api_1)("@prodia/v1.3.0#be019b2kls0gqss3");
 sdk.auth("43435e1c-cab1-493f-a224-f51e4b97ce8d");
 var herc = new hercai_1.Hercai();
 var apexAI_1 = require("./apexAI");
@@ -587,7 +587,7 @@ function apexChecker(urls) {
                             switch (_a.label) {
                                 case 0:
                                     _a.trys.push([0, 2, , 3]);
-                                    return [4 /*yield*/, axios_1.default.post("https://api-inference.huggingface.co/models/Salesforce/blip-image-captioning-base", { image: urls }, {
+                                    return [4 /*yield*/, axios_1.post("https://api-inference.huggingface.co/models/Salesforce/blip-image-captioning-base", { image: urls }, {
                                             headers: {
                                                 "Content-Type": "application/json",
                                                 Authorization: "Bearer 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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apexify.js",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "description": "Ai with Canvas and Database library. Supports typescript and javascript",
   "main": "index.js",
   "scripts": {
@@ -132,7 +132,6 @@
   "dependencies": {
     "@iamtraction/google-translate": "^2.0.1",
     "@napi-rs/canvas": "^0.1.51",
-    "apexify.js": "^2.2.0",
     "api": "^6.1.1",
     "archiver": "^7.0.0",
     "axios": "^1.6.7",

package/lib/recoded-ai/ApexAI.js

@@ -1,37 +0,0 @@
-const utils = require('./utils');
-const Hercai = require("hercai");
-const axios = require("axios");
-const utils1 = require("./utils");
-const discord = require("discord.js");
-const tools = require("../discord/events/handler/tools");
-const drawMenu = require("../discord/events/handler/drawMenu");
-
-const herc = new Hercai()
-
-
-var unclearPhrases = [
-    "Can you please provide more information or clarify your question?",
-    "Could you please provide more context or clarify your question?",
-    "Could you please provide more context or clarify what you mean?",
-    "I'm not sure I understand the question.",
-    "Could you please provide more context or clarify your question",
-    "I'm not sure what you're asking for.",
-    "Could you please provide more context or rephrase your question?",
-    "I'm not sure what you're asking",
-    "Can you please rephrase or provide more context?",
-    "Could you please provide more context or clarify your request?",
-    "I couldn't understand your input",
-    "Could you please provide some more information or clarify what you mean?",
-    "Can you please provide more information or clarify your request?",
-];
-
-
-async function apexAI(message, options) {
-
-  if (!message) {
-    throw new Error(`Invalid Usage: Please define the parameter (message) => apexAI(message, options)`)
-  }
-
-}
-
-module.exports = { apexAI };