apexify.js 1.2.5 → 1.2.7

package/lib/ai/apexAI.js

@@ -43,7 +43,7 @@ var utils_1 = require("./utils");
 var discord_js_1 = require("discord.js");
 var tools_1 = require("../discord/events/handler/tools");
 var drawMenu_1 = require("../discord/events/handler/drawMenu");
-var btn_1 = require("../discord/events/handler/btn");
+//var btn_1 = require("../discord/events/handler/btn");
 var hercai = new hercai_1.Hercai();
 var unclearPhrases = [
     "Can you please provide more information or clarify your question?",
@@ -77,7 +77,7 @@ function apexAI(message, options) {
                    return [4 /*yield*/, (0, tools_1.filters)(message.client)];
                 case 2:
                     _w.sent();
-                    return [4 /*yield*/, (0, btn_1.btn)(message.client)];
+              //      return [4 /*yield*/, (0, btn_1.btn)(message.client)];
                 case 3:
                     _w.sent();
                     _w.label = 4;

package/lib/ai/models.js

@@ -38,13 +38,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApexChat = exports.ApexImagine = void 0;
 var hercai_1 = require("hercai");
-var herc = new hercai_1.Hercai();
 var api = require("api");
 var sdk = api("@prodia/v1.3.0#be019b2kls0gqss3");
 sdk.auth("43435e1c-cab1-493f-a224-f51e4b97ce8d");
+var herc = new hercai_1.Hercai();
 function ApexImagine(model, prompt, options) {
     return __awaiter(this, void 0, void 0, function () {
-        var negative, number, neg, count, resultUrls, allowedModelsH, validProdiaModalsP, retryCount, result_1, error_1, generateResponse, generatedJobId, result_2;
+        var negative, number, neg, count, resultUrls, allowedModelsH, validProdiaModalsP, i, result, error_1, i, generateResponse, generatedJobId, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -60,6 +60,7 @@ function ApexImagine(model, prompt, options) {
                     else {
                         throw new Error('Invalid number parameter. It must be an integer between 1 and 4.');
                     }
+                    resultUrls = [];
                     allowedModelsH = ['v1', 'v2', 'v2-beta', 'lexica', 'prodia', 'animefy', 'raava', 'shonin'];
                     validProdiaModalsP = [
                         "3Guofeng3_v34.safetensors [50f420de]",
@@ -121,40 +122,33 @@ function ApexImagine(model, prompt, options) {
                         "timeless-1.0.ckpt [7c4971d4]",
                         "toonyou_beta6.safetensors [980f6b15]",
                     ];
-                    if (!allowedModelsH.includes(model)) return [3 /*break*/, 8];
-                    retryCount = 3;
+                    if (!allowedModelsH.includes(model)) return [3 /*break*/, 7];
+                    i = 0;
                     _a.label = 1;
                 case 1:
-                    if (!(retryCount > 0)) return [3 /*break*/, 7];
+                    if (!(i < count)) return [3 /*break*/, 6];
                     _a.label = 2;
                 case 2:
-                    _a.trys.push([2, 4, , 6]);
-                    return [4 /*yield*/, herc.drawImage({ model: "".concat(model), prompt: "".concat(prompt), negative_prompt: "".concat(neg) })];
+                    _a.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, herc.drawImage({ model: model, prompt: prompt, negative_prompt: neg })];
                 case 3:
-                    result_1 = _a.sent();
-                    return [3 /*break*/, 7];
+                    result = _a.sent();
+                    resultUrls.push(result.url);
+                    return [3 /*break*/, 5];
                 case 4:
                     error_1 = _a.sent();
-                    console.error('Failed to draw image with Hercai. Retrying...', error_1);
-                    retryCount--;
-                    return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 3000); })];
+                    console.error("Failed to draw image with Hercai. Retrying...", error_1);
+                    return [3 /*break*/, 5];
                 case 5:
-                    _a.sent();
-                    return [3 /*break*/, 6];
-                case 6: return [3 /*break*/, 1];
+                    i++;
+                    return [3 /*break*/, 1];
+                case 6: return [3 /*break*/, 12];
                 case 7:
-                    if (result_1 && result_1.url) {
-                        resultUrls = Array.from({ length: count }, function () { return result_1.url; });
-                    }
-                    else if (Array.isArray(result_1)) {
-                        resultUrls = result_1.slice(0, count).map(function (item) { return item.url; });
-                    }
-                    else {
-                        throw new Error('Invalid result format. Expected an object or an array.');
-                    }
-                    return [3 /*break*/, 11];
+                    if (!validProdiaModalsP.includes(model)) return [3 /*break*/, 12];
+                    i = 0;
+                    _a.label = 8;
                 case 8:
-                    if (!validProdiaModalsP.includes(model)) return [3 /*break*/, 11];
+                    if (!(i < count)) return [3 /*break*/, 12];
                     return [4 /*yield*/, sdk.generate({
                             model: model,
                             prompt: prompt,
@@ -164,18 +158,18 @@ function ApexImagine(model, prompt, options) {
                     generatedJobId = generateResponse.data.job;
                     return [4 /*yield*/, checkJobStatus(generatedJobId)];
                 case 10:
-                    result_2 = _a.sent();
-                    if (result_2) {
-                        resultUrls = Array.from({ length: count }, function () { return result_2; });
-                    }
-                    else if (Array.isArray(result_2)) {
-                        resultUrls = result_2.slice(0, count).map(function (item) { return item; });
+                    result = _a.sent();
+                    if (result) {
+                        resultUrls.push(result);
                     }
                     else {
-                        throw new Error('Invalid result format. Expected an object or an array.');
+                        console.error('Invalid result format. Expected a URL.');
                     }
                     _a.label = 11;
-                case 11: return [2 /*return*/, resultUrls];
+                case 11:
+                    i++;
+                    return [3 /*break*/, 8];
+                case 12: return [2 /*return*/, resultUrls];
             }
         });
     });
@@ -193,22 +187,22 @@ function checkJobStatus(jobId, retryCount) {
                 case 1:
                     getJobResponse = _a.sent();
                     jobData = getJobResponse.data;
-                    if (!(jobData.status === 'generating' || jobData.status === 'queued')) return [3 /*break*/, 5];
+                    if (!(jobData.status === "generating" || jobData.status === "queued")) return [3 /*break*/, 5];
                     if (!(retryCount > 0)) return [3 /*break*/, 3];
                     return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 3000); })];
                 case 2:
                     _a.sent();
                     return [2 /*return*/, checkJobStatus(jobId, retryCount - 1)];
                 case 3:
-                    console.error('Job failed after multiple retries:', jobData);
+                    console.error("Job failed after multiple retries:", jobData);
                     return [2 /*return*/, null];
                 case 4: return [3 /*break*/, 6];
                 case 5:
-                    if (jobData.status === 'succeeded') {
+                    if (jobData.status === "succeeded") {
                         return [2 /*return*/, jobData.imageUrl];
                     }
                     else {
-                        console.error('Job failed:', jobData);
+                        console.error("Job failed:", jobData);
                         return [2 /*return*/, null];
                     }
                     _a.label = 6;
@@ -224,18 +218,25 @@ function checkJobStatus(jobId, retryCount) {
 }
 function ApexChat(model, prompt) {
     return __awaiter(this, void 0, void 0, function () {
-        var herc, response;
+        var response, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    herc = new hercai_1.Hercai();
+                    _a.trys.push([0, 4, , 5]);
+                    if (!['v3', 'v3-32k', 'turbo', 'turbo-16k', 'gemini'].includes(model)) return [3 /*break*/, 2];
                     return [4 /*yield*/, herc.question({ model: "".concat(model), content: "".concat(prompt) })];
                 case 1:
                     response = _a.sent();
                     return [2 /*return*/, response.reply];
+                case 2: throw new Error('Wrong modal being used please check documentation for valid modals');
+                case 3: return [3 /*break*/, 5];
+                case 4:
+                    e_1 = _a.sent();
+                    console.error(e_1.message);
+                    return [2 /*return*/, ''];
+                case 5: return [2 /*return*/];
             }
         });
     });
 }
-
-exports.ApexChat = ApexChat;
+exports.ApexChat = ApexChat;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apexify.js",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "",
   "main": "index.js",
   "scripts": {