apexify.js 4.7.4 → 4.7.6

package/lib/ai/ApexAI.ts

@@ -93,10 +93,12 @@ export interface Options {
       Api_Keys?: {
         groq_API?: string;
         electronHub_Key?:  string
-      }; 
+      };
       memory?: {
           memoryOn?: boolean;
           id?: string;
+          threshold?: number;
+          limit?: number;
       };
       typeWriting?: {
           enable?: boolean;
@@ -234,7 +236,7 @@ export async function ApexAI(message: Message, ApexOptions: Options) {
               console.error("Missing Groq API Key.");
               continue;
             }
-            prompt += `\n> Image analysis:\n${await groqAnalyzer({ imgURL: url, ApiKey: Api_Keys.groq_API })}`;
+            prompt += `\n> Image analysis:\n${await groqAnalyzer({ img: url, ApiKey: Api_Keys.groq_API })}`;
           }
   
 
@@ -269,7 +271,7 @@ export async function ApexAI(message: Message, ApexOptions: Options) {
         const firstAttachment = fetchedMessage.attachments?.first();
         if (firstAttachment && /\.(png|jpg|jpeg|webp)$/i.test(firstAttachment.url)) {
           prevReply += await groqAnalyzer({
-            imgURL: firstAttachment.url,
+            img: firstAttachment.url,
             ApiKey: Api_Keys?.groq_API,
             prompt,
           });
@@ -331,7 +333,7 @@ export async function ApexAI(message: Message, ApexOptions: Options) {
             instruction += `\n\nThe image has already been generated. Do not attempt to generate or describe another image. Instead, provide feedback, thoughts, or a critique based on the given prompt:\n\n`;
         }
 
-        aiResponse = await ApexChat(chat?.chatModel as string, prompt, { instruction, memory: chat?.memory?.memoryOn, userId: chat?.memory?.id, limit: 15 });
+        aiResponse = await ApexChat(chat?.chatModel as string, prompt, { instruction, memory: chat?.memory?.memoryOn, userId: chat?.memory?.id, limit: chat?.memory?.limit, threshold: chat?.memory?.threshold });
     }
         
     else if (voiceEnabled) {
@@ -354,7 +356,7 @@ export async function ApexAI(message: Message, ApexOptions: Options) {
             instruction += `\n\nThe image has already been generated. Do not attempt to generate or describe another image. Instead, provide feedback, thoughts, or a critique based on the given prompt:\n\n`;
         }
 
-        aiResponse = await ApexChat(chat?.chatModel as string, prompt, { instruction, memory: chat?.memory?.memoryOn, userId: chat?.memory?.id, limit: 15 });
+        aiResponse = await ApexChat(chat?.chatModel as string, prompt, { instruction, memory: chat?.memory?.memoryOn, userId: chat?.memory?.id, limit: chat?.memory?.limit, threshold: chat?.memory?.threshold });
 
         aiResponse = await ApexText2Speech({ modelName: voice?.voiceModel, inputText: aiResponse, personality: voice?.characterName });
     }

package/lib/ai/ApexModules.ts

@@ -41,7 +41,7 @@ type ChatModelOption = "v3" | "v3-32k" | "turbo" | "turbo-16k" | "gemini" ;
 type hercmodals = "v3" | "lexica" | "prodia" | "animefy" | "raava" | "shonin" | "simurg";
 
 async function ApexImagine(model: string, prompt: string, options?: ApexImagineOptions): Promise<string[] | undefined> {
-  let imageURL: string | null = '';
+  let imageURL: string | Buffer = '';
   let response: string[] = [];
   const imageType = await validateModels();
   const { Api_Key = 'eaebff6e-c7b2-477c-8edd-9aa91becf1e3', nsfw = false, deepCheck = false, nsfwWords = [], count = 2, negative_prompt = "", sampler = "DPM++ 2M Karras", height = 1024, width = 1024, cfg_scale = 9, steps = 20, seed = -1, image_style = "cinematic" } = options ?? {};
@@ -570,7 +570,7 @@ async function ApexImagine(model: string, prompt: string, options?: ApexImagineO
           let shouldExclude = false;
 
           if (nsfw === true) {
-             const caption = await groqAnalyzer({ imgURL: imageURL, prompt });
+             const caption = await groqAnalyzer({ img: imageURL, prompt });
              if (!caption) return;
              shouldExclude = NSFWWORDS.some(word => caption.includes(word));
              shouldExclude = nsfwWords.some(word => caption.includes(word));

package/lib/ai/modals-chat/groq/imageAnalyzer.ts

@@ -1,61 +1,83 @@
-import Groq from 'groq-sdk';
-import axios from 'axios';
+import Groq from "groq-sdk";
+import axios from "axios";
+import fs from "fs";
+import path from "path";
 
 interface GroqAnalyzerOptions {
-  imgURL: string;
+  img: string | Buffer;
   ApiKey?: string;
   prompt?: string;
 }
 
 async function convertUrlToDataUrl(url: string): Promise<string> {
   try {
-    const response = await axios.get(url, { responseType: 'arraybuffer' });
-    const buffer = Buffer.from(response.data, 'binary');
-    const dataUrl = `data:${response.headers['content-type']};base64,${buffer.toString('base64')}`;
-    return dataUrl;
+    const response = await axios.get(url, { responseType: "arraybuffer" });
+    const buffer = Buffer.from(response.data, "binary");
+    return `data:${response.headers["content-type"]};base64,${buffer.toString("base64")}`;
   } catch (error) {
-    console.error('Error converting URL to Data URL:', error);
-    throw new Error('Failed to convert image URL to data URL');
+    console.error("Error converting URL to Data URL:", error);
+    throw new Error("Failed to convert image URL to data URL");
   }
 }
 
-export async function groqAnalyzer({ imgURL, ApiKey, prompt }: GroqAnalyzerOptions): Promise<string> {
+async function convertFileToDataUrl(filePath: string): Promise<string> {
+  try {
+    const absolutePath = path.resolve(filePath);
+    const buffer = fs.readFileSync(absolutePath);
+    const mimeType = "image/png";
+    return `data:${mimeType};base64,${buffer.toString("base64")}`;
+  } catch (error) {
+    console.error("Error converting file to Data URL:", error);
+    throw new Error("Failed to convert file to data URL");
+  }
+}
+
+function convertBufferToDataUrl(buffer: Buffer): string {
+  const mimeType = "image/png"; // Adjust dynamically if needed
+  return `data:${mimeType};base64,${buffer.toString("base64")}`;
+}
+
+export async function groqAnalyzer({ img, ApiKey, prompt }: GroqAnalyzerOptions): Promise<string> {
   try {
     const groq = new Groq({
-      apiKey: ApiKey || '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',
+      apiKey: ApiKey || "your-api-key-here",
     });
 
-    const imageDataUrl = await convertUrlToDataUrl(imgURL);
+    let imageDataUrl: string;
+
+    if (typeof img === "string") {
+      if (img.startsWith("http")) {
+        imageDataUrl = await convertUrlToDataUrl(img);
+      } else {
+        imageDataUrl = await convertFileToDataUrl(img);
+      }
+    } else if (Buffer.isBuffer(img)) {
+      imageDataUrl = convertBufferToDataUrl(img);
+    } else {
+      throw new Error("Invalid image input. Must be a URL, file path, or Buffer.");
+    }
 
     const chatCompletion = await groq.chat.completions.create({
-        messages: [
-          {
-            role: 'user',
-            content: [
-              {
-                type: 'text',
-                text: prompt || '',
-              },
-              {
-                type: 'image_url',
-                image_url: {
-                  url: imageDataUrl,
-                },
-              },
-            ],
-          },
-        ],
-        model: 'llama-3.2-90b-vision-preview',
-        temperature: 0,
-        max_tokens: 8192,
-        top_p: 1,
-        stream: false,
-        stop: null,
-      });
-  
+      messages: [
+        {
+          role: "user",
+          content: [
+            { type: "text", text: prompt || "" },
+            { type: "image_url", image_url: { url: imageDataUrl } },
+          ],
+        },
+      ],
+      model: "llama-3.2-90b-vision-preview",
+      temperature: 0,
+      max_tokens: 8192,
+      top_p: 1,
+      stream: false,
+      stop: null,
+    });
+
     return chatCompletion.choices[0].message.content as string;
   } catch (error) {
-    console.error('Error in groqAnalyzer:', error);
-    return 'Error occurred at the api'
+    console.error("Error in groqAnalyzer:", error);
+    return "❌ Error occurred while analyzing the image.";
   }
 }

package/lib/canvas/utils/Image/imageProperties.ts

@@ -643,6 +643,7 @@ export function objectRadius(
   ctx.beginPath();
 
   if (borderRadius === "circular") {
+    // Draw a circular shape
     const circleRadius = Math.min(width, height) / 2;
     ctx.arc(x + width / 2, y + height / 2, circleRadius, 0, 2 * Math.PI);
   } else if (borderRadius > 0) {
@@ -651,16 +652,34 @@ export function objectRadius(
       borderPosition.toLowerCase().split(",").map((s) => s.trim())
     );
 
-    const roundTopLeft = selectedPositions.has("all") || selectedPositions.has("top-left") || (selectedPositions.has("top") && selectedPositions.has("left"));
-    const roundTopRight = selectedPositions.has("all") || selectedPositions.has("top-right") || (selectedPositions.has("top") && selectedPositions.has("right"));
-    const roundBottomRight = selectedPositions.has("all") || selectedPositions.has("bottom-right") || (selectedPositions.has("bottom") && selectedPositions.has("right"));
-    const roundBottomLeft = selectedPositions.has("all") || selectedPositions.has("bottom-left") || (selectedPositions.has("bottom") && selectedPositions.has("left"));
+    // **Correct Grouping**
+    const roundTopLeft = selectedPositions.has("all") ||
+      selectedPositions.has("top-left") ||
+      selectedPositions.has("top") ||
+      selectedPositions.has("left");
 
+    const roundTopRight = selectedPositions.has("all") ||
+      selectedPositions.has("top-right") ||
+      selectedPositions.has("top") ||
+      selectedPositions.has("right");
+
+    const roundBottomRight = selectedPositions.has("all") ||
+      selectedPositions.has("bottom-right") ||
+      selectedPositions.has("bottom") ||
+      selectedPositions.has("right");
+
+    const roundBottomLeft = selectedPositions.has("all") ||
+      selectedPositions.has("bottom-left") ||
+      selectedPositions.has("bottom") ||
+      selectedPositions.has("left");
+
+    // **Assign correct radii**
     const tl = roundTopLeft ? br : 0;
     const tr = roundTopRight ? br : 0;
     const brR = roundBottomRight ? br : 0;
     const bl = roundBottomLeft ? br : 0;
 
+    // **Draw rounded rectangle**
     ctx.moveTo(x + tl, y);
     ctx.lineTo(x + width - tr, y);
     if (tr > 0) ctx.arc(x + width - tr, y + tr, tr, -Math.PI / 2, 0, false);
@@ -671,6 +690,7 @@ export function objectRadius(
     ctx.lineTo(x, y + tl);
     if (tl > 0) ctx.arc(x + tl, y + tl, tl, Math.PI, -Math.PI / 2, false);
   } else {
+    // Default: Draw normal rectangle
     ctx.rect(x, y, width, height);
   }
 

package/lib/index.ts

@@ -10,7 +10,6 @@ const RESET = "\x1b[0m";
 const packageJsonPath = path.resolve(process.cwd(), "package.json");
 let packageJson: Record<string, any> = {};
 
-// ** Load package.json Safely **
 try {
     packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
 } catch (error) {
@@ -28,7 +27,6 @@ const getLibraryVersion = (library: string): string => {
     );
 };
 
-// ** Check Installed Version BEFORE Fetching Remote Version **
 const installedVersion = getLibraryVersion("apexify.js");
 
 fetch("https://registry.npmjs.com/-/v1/search?text=apexify.js")
@@ -64,7 +62,6 @@ if (!installedVersion || installedVersion === "Not installed") {
     console.log(`${GREEN}✅ Apexify.js is already installed (Version: ${installedVersion}).${RESET}`);
 }
 
-// ✅ FIX: Do NOT uninstall automatically
 
 import { 
     ApexAI, ApexChat, ApexImagine, ApexPainter, ApexListener, readFile, 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apexify.js",
-  "version": "4.7.4",
+  "version": "4.7.6",
   "description": "Unlimited AI models and Canvas library. Supports ts & js (supports front/back end).",
   "author": "zenith-79",
   "license": "MIT",
@@ -227,7 +227,7 @@
   "dependencies": {
     "@google/generative-ai": "^0.22.0",
     "@napi-rs/canvas": "^0.1.53",
-    "apexify.js": "^4.7.3",
+    "apexify.js": "^4.7.5",
     "axios": "^1.7.7",
     "discord.js": "^14.18.0",
     "fluent-ffmpeg": "^2.1.3",