apexify.js 4.5.54 → 4.5.56

package/lib/ai/ApexModules.ts

@@ -1,11 +1,9 @@
 import { Hercai } from 'hercai';
-import translate from "@iamtraction/google-translate";
 import { validateModels } from "./functions/validOptions";
 import { whisper } from './modals-chat/groq/whisper';
 import { connect } from 'verse.db';
 import { otherChatModels } from './modals-chat/others/otherModels';
 import { chatGroq } from './modals-chat/groq/chatgroq';
-import { geminiFast } from './modals-chat/gemini/geminiFast';
 import { groqAnalyzer } from './utils';
 import { electronImagine } from './modals-chat/electronHub/imageModels';
 import { electronChat } from './modals-chat/electronHub/chatmodels';
@@ -30,7 +28,7 @@ export interface ApexImagineOptions {
    image_style?: any;
    width?: number;
    height?: number;
-   format?: "jpeg" | "png" | "webp";
+   format?: "jpeg" | "png";
    quality?: number;
    steps?: number;
    seed?: number;
@@ -48,10 +46,7 @@ async function ApexImagine(model: string, prompt: string, options?: ApexImagineO
   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 ?? {};
 
-  const translatedText = await translate(prompt, {
-     from: "auto",
-     to: "en"
-    });
+  const translatedText = await electronChat({ modelName: 'gpt-4o', prompt: `Translate The text below into english:\n\n${prompt}` }) as string;
 
   if (count > 4 || count <= 0) throw new Error("Inavlid usage. Count can't be less than 0 or more than 4.");
   if ((width || height) <= 0) throw new Error("Inavlid usage. Image width/height can't be less than 0 or more than 1024.");
@@ -60,7 +55,7 @@ async function ApexImagine(model: string, prompt: string, options?: ApexImagineO
      if (imageType.validHercaiModels.includes(model)) {
         if (model === 'prodia-v2') {
            imageURL = (await hercai.betaDrawImage({ 
-              prompt: translatedText.text, 
+              prompt: translatedText, 
               negative_prompt: negative_prompt, 
               sampler: "DPM-Solver", 
               image_style: image_style, 
@@ -72,12 +67,12 @@ async function ApexImagine(model: string, prompt: string, options?: ApexImagineO
         } else {
            imageURL = (await hercai.drawImage({ 
               model: model as hercmodals, 
-              prompt: translatedText.text, 
+              prompt: translatedText, 
               negative_prompt: negative_prompt 
            })).url;
         }
      }  else if (imageType.validElectronModels.includes(model)) {
-      const gen = await electronImagine({ ApiKey: Api_Key as string, prompt: translatedText.text, modelName: model, resizeOptions: { height, width, format: options?.format, quality: options?.quality } });
+      const gen = await electronImagine({ ApiKey: Api_Key as string, prompt: translatedText, modelName: model, resizeOptions: { height, width, format: options?.format, quality: options?.quality } });
       if (gen === null) throw new Error('this model reached rate limit. Provide your own api key from: "https://discord.gg/94qUZWhwFE"');
       imageURL = gen as string
     } else {
@@ -582,9 +577,9 @@ async function ApexImagine(model: string, prompt: string, options?: ApexImagineO
           }
 
           if (deepCheck === true) {
-             shouldExclude = shouldExclude || NSFWWORDS.some(word => translatedText.text.includes(word));
+             shouldExclude = shouldExclude || NSFWWORDS.some(word => translatedText.includes(word));
              shouldExclude = shouldExclude || NSFWWORDS.some(word => prompt.includes(word));
-             shouldExclude = shouldExclude || nsfwWords.some(word => translatedText.text.includes(word));
+             shouldExclude = shouldExclude || nsfwWords.some(word => translatedText.includes(word));
              shouldExclude = shouldExclude || nsfwWords.some(word => prompt.includes(word));
           }
 
@@ -600,11 +595,6 @@ async function ApexImagine(model: string, prompt: string, options?: ApexImagineO
 async function ApexChat(model: string, prompt: string, { userId, memory, limit, instruction, Api_key }: { userId?: string, memory?: boolean, limit?: number, instruction?: string, Api_key?: string }): Promise<string> {
   try {
 
-    if (model === 'gemini-flash' || model === 'gemini-pro') {
-      const geminiResponse = await geminiFast({ Api_key, modal: model, user: userId, memory, instruction, limit, prompt })
-      return geminiResponse
-    }
-
     let enhancedPrompt: string = prompt;
     let historyChat: string = `- This is Previous chat history between you (System) and the user (User)\n`;
     let commandString: string = ''

package/lib/ai/functions/draw.ts

@@ -1,4 +1,3 @@
-import translate from "@iamtraction/google-translate";
 import {
   ButtonBuilder,
   StringSelectMenuBuilder,
@@ -52,9 +51,7 @@ async function aiImagine(
 
     await message.channel?.sendTyping();
 
-    const translatedText = await retry(() =>
-      translate(textToDraw, { from: "auto", to: "en" })
-    );
+    const translatedText = await electronChat({ modelName: 'gpt-4o', prompt: `Translate The text below into english:\n\n${prompt}` }) as string;
 
     const nsfwWords: string[] = nsfwKeyWords || [
         "2g1c",
@@ -539,7 +536,7 @@ async function aiImagine(
         "ass",
       ];
     if (deepCheck) {
-      if (translatedText.text && nsfwWords.some(word => translatedText.text.includes(word))) {
+      if (translatedText && nsfwWords.some(word => translatedText.includes(word))) {
         return message.reply("Warning ⚠️. Your prompt contains **`NSFW/Illegal/Prohibited`** words. Please refrain from doing this.");
       }
 
@@ -553,11 +550,11 @@ async function aiImagine(
 
       try {
         if (imageModal === 'prodia-v2') {
-          response = await retry(() => hercai.betaDrawImage({ prompt: translatedText.text, ...enhancer }));
+          response = await retry(() => hercai.betaDrawImage({ prompt: translatedText, ...enhancer }));
         } else if (imageType.validHercaiModels.includes(imageModal)) {
-          response = await retry(() => hercai.drawImage({ model: imageModal, prompt: translatedText.text }));
+          response = await retry(() => hercai.drawImage({ model: imageModal, prompt: translatedText }));
         } else if (imageType.validElectronModels.includes(imageModal)) {
-          response = await electronImagine({ ApiKey: imageAPIS?.electronHubKey as any, prompt: translatedText.text, modelName: imageModal, resizeOptions: { width: enhancer.width , height: enhancer.height, format: enhancer.format, quality: enhancer.quality } });
+          response = await electronImagine({ ApiKey: imageAPIS?.electronHubKey as any, prompt: translatedText, modelName: imageModal, resizeOptions: { width: enhancer.width , height: enhancer.height, format: enhancer.format, quality: enhancer.quality } });
         } else {
           throw new Error("Invalid modal name.");
         }
@@ -629,6 +626,7 @@ export { aiImagine };
 
 
 import { createCanvas, loadImage } from "@napi-rs/canvas";
+import { electronChat } from "../modals-chat/electronHub/chatmodels";
 
 export async function resizeAndSharpen(imageBuffer: Buffer) {
   const originalImage = await loadImage(imageBuffer);

package/lib/ai/modals-chat/electronHub/imageModels.ts

@@ -15,7 +15,7 @@ export async function electronImagine({
   resizeOptions?: {
     width?: number;
     height?: number;
-    format?: "jpeg" | "png" | "webp";
+    format?: "jpeg" | "png" ;
     quality?: number;
   };
 }): Promise<string | undefined> {
@@ -84,11 +84,8 @@ export async function electronImagine({
         case "png":
           imageProcessor = imageProcessor.png({ quality });
           break;
-        case "webp":
-          imageProcessor = imageProcessor.webp({ quality });
-          break;
         default:
-          break;
+          throw Error('We dont support this format only png and jpeg');
       }
     }
 

package/lib/ai/utils.ts

@@ -1,21 +1,17 @@
 import { imageReader } from "./functions/imageReader";
 import { chunkString } from "./functions/chunkString";
 import { toDraw } from "./functions/shouldDrawImage";
-import { aiVoice } from "./functions/generateVoiceResponse";
 import { aiImagine } from "./functions/draw";
 import { readFile } from "./functions/readFiles";
 import { ApexChat, ApexImagine, ApexListener, ApexVideo, ApexText2Speech } from "./ApexModules";
 import { typeWriter } from "./functions/typeWriter" ;
 import { groqAnalyzer } from "./modals-chat/groq/imageAnalyzer";
-import { geminiFlash } from "./modals-chat/gemini/Gemini-flash";
-import { geminiPro } from "./modals-chat/gemini/Gemini-pro";
 
 
 export {
   chunkString,
   imageReader,
   toDraw,
-  aiVoice,
   aiImagine,
   readFile,
   ApexChat,
@@ -23,8 +19,6 @@ export {
   ApexListener,
   typeWriter,
   groqAnalyzer,
-  geminiFlash,
-  geminiPro,
   ApexVideo,
   ApexText2Speech
 };

package/lib/canvas/ApexPainter.ts

@@ -1,4 +1,4 @@
-import { createCanvas, loadImage, GlobalFonts, Image, Canvas  } from "@napi-rs/canvas";
+import { createCanvas, loadImage, GlobalFonts, Image, SKRSContext2D  } from "@napi-rs/canvas";
 import GIFEncoder from "gifencoder";
 import ffmpeg from 'fluent-ffmpeg';
 import { PassThrough} from "stream";
@@ -9,7 +9,9 @@ import { OutputFormat, CanvasConfig, TextObject, ImageProperties, GIFOptions, GI
      drawBackgroundGradient, drawBackgroundColor, customBackground, circularBorder, radiusBorder, customLines, applyRotation, applyStroke,
      applyShadow, imageRadius, drawShape, drawText, converter, resizingImg, applyColorFilters, imgEffects,verticalBarChart, pieChart,
      lineChart, cropInner, cropOuter, bgRemoval, detectColors, removeColor, dataURL, base64, arrayBuffer, blob, url, GradientConfig, Frame,
-     PatternOptions, ExtractFramesOptions
+     PatternOptions, ExtractFramesOptions,
+     applyZoom,
+     ResizeOptions
     } from "./utils/utils";
 
   interface CanvasResults {
@@ -24,42 +26,75 @@ export class ApexPainter {
     this.format = { type: type || 'buffer' };
   }
 
+  /**
+   * Creates a canvas with the given configuration.
+   * Applies rotation, shadow, border effects, background, and stroke.
+   *
+   * @param canvas - The configuration options for the canvas.
+   * @returns A promise that resolves to an object containing the image buffer and the canvas config.
+   * @throws If the 2D context cannot be retrieved.
+   */
   async createCanvas(canvas: CanvasConfig): Promise<CanvasResults> {
-    let canvasWidth: number = canvas.width || 500;
-    let canvasHeight: number = canvas.height || 500;
-    let borderRadius: number | string = canvas.borderRadius || 0;
-
-    const canvasInstance = createCanvas(canvasWidth, canvasHeight);
-    const ctx: any = canvasInstance.getContext('2d');
-
+    const {
+      width = 500,
+      height = 500,
+      x = 0,
+      y = 0,
+      rotation = 0,
+      borderRadius = 0,
+      customBg,
+      gradientBg,
+      stroke,
+      shadow,
+      borderPosition = 'all',
+      opacity = 1,
+      zoom
+    } = canvas;
+  
+    const canvasInstance = createCanvas(width, height);
+    const ctx = canvasInstance.getContext('2d') as SKRSContext2D | null;
     if (!ctx) {
-        throw new Error('Unable to get 2D rendering context from canvas');
+      throw new Error('Unable to get 2D rendering context from canvas');
     }
+  
+    // Set the global opacity for all drawing operations.
+    ctx.globalAlpha = opacity;
 
-    applyRotation(ctx, canvas.rotation || 0, canvas.x || 0, canvas.y || 0, canvasWidth, canvasHeight);
-
-    applyShadow(ctx, canvas.shadow, canvas.x || 0, canvas.y || 0, canvasWidth, canvasHeight);
-
+    // Apply rotation and shadow.
+    applyRotation(ctx, rotation, x, y, width, height);
+    applyShadow(ctx, shadow, x, y, width, height);
+  
+    // --- Draw Background With Clipping ---
+    // Save state before applying the clip.
+    ctx.save();
     if (typeof borderRadius === 'string') {
-        circularBorder(ctx, canvasWidth, canvasHeight);
+      circularBorder(ctx, width, height);
     } else if (typeof borderRadius === 'number') {
-        radiusBorder(ctx, canvas.x || 0, canvas.y || 0, canvasWidth, canvasHeight, borderRadius);
+      radiusBorder(ctx, x, y, width, height, borderRadius, borderPosition);
     }
 
-    if (canvas.customBg) {
-        await customBackground(ctx, canvas);
-    } else if (canvas.gradientBg) {
-        await drawBackgroundGradient(ctx, canvas);
-    } else {
-        await drawBackgroundColor(ctx, canvas);
-    }
+    // Option 1: translate context to (x, y) before drawing the background.
+    ctx.translate(x, y);
 
-    applyStroke(ctx, canvas.stroke, canvas.x || 0, canvas.y || 0, canvasWidth, canvasHeight);
+    applyZoom(ctx, zoom);
 
-    return { buffer: canvasInstance.toBuffer('image/png'), canvas }
+    if (customBg) {
+      await customBackground(ctx, canvas);
+    } else if (gradientBg) {
+      await drawBackgroundGradient(ctx, canvas);
+    } else {
+      await drawBackgroundColor(ctx, canvas);
+    }
+    // Restore state to remove the clipping region so that stroke is not clipped.
+    ctx.restore();
+  
+    // --- Draw Stroke (Outline) ---
+    applyStroke(ctx, stroke, x, y, width, height);
+  
+    return { buffer: canvasInstance.toBuffer('image/png'), canvas };
   }
 
-    async createImage(images: ImageProperties[], canvasBuffer: CanvasResults | Buffer): Promise<Buffer> {
+  async createImage(images: ImageProperties[], canvasBuffer: CanvasResults | Buffer): Promise<Buffer> {
 
       if (!Array.isArray(images)) {
         images = [images];
@@ -301,7 +336,7 @@ async createGIF(gifFrames: { background: string; duration: number }[], options:
   }
 }
 
-  async resize(resizeOptions: { imagePath: string | Buffer; size: { width: number; height: number } }) {
+  async resize(resizeOptions: ResizeOptions) {
     return resizingImg(resizeOptions)
   }
 
@@ -433,7 +468,7 @@ async createGIF(gifFrames: { background: string; duration: number }[], options:
     }
   }
 
-  private async drawImage(ctx: any, image: ImageProperties): Promise<void> {
+  private async drawImage(ctx: SKRSContext2D, image: ImageProperties): Promise<void> {
     const { source, x, y, width, height, rotation, borderRadius, stroke, shadow, isFilled, color, gradient, borderPosition, opacity } = image;
 
     if (!source || typeof x !== 'number' || typeof y !== 'number' || typeof width !== 'number' || typeof height !== 'number') {
@@ -562,7 +597,7 @@ async setPatternBackground(buffer:Buffer, options: PatternOptions) {
 
     const img = await loadImage(buffer);
     const canvas = createCanvas(img.width, img.height);
-    const ctx: any = canvas.getContext('2d');
+    const ctx: SKRSContext2D = canvas.getContext('2d');
     ctx.drawImage(img, 0, 0);
 
     const x = options.x || 0;
@@ -618,7 +653,7 @@ async setPatternBackground(buffer:Buffer, options: PatternOptions) {
    * @param y The y offset of the area.
    */
   async fillWithGradient(
-    ctx: any,
+    ctx: SKRSContext2D,
     width: number,
     height: number,
     gradient: GradientConfig,
@@ -663,7 +698,7 @@ async setPatternBackground(buffer:Buffer, options: PatternOptions) {
    * @param y The y offset of the area.
    */
   async  drawDotsPattern(
-    ctx: any,
+    ctx: SKRSContext2D,
     width: number,
     height: number,
     options: PatternOptions,
@@ -695,7 +730,7 @@ async setPatternBackground(buffer:Buffer, options: PatternOptions) {
    * @param y The y offset of the area.
    */
   async drawStripesPattern(
-    ctx: any,
+    ctx: SKRSContext2D,
     width: number,
     height: number,
     options: PatternOptions,
@@ -731,7 +766,7 @@ async setPatternBackground(buffer:Buffer, options: PatternOptions) {
    * @param y The y offset of the area.
    */
   async drawGridPattern(
-    ctx: any,
+    ctx: SKRSContext2D,
     width: number,
     height: number,
     options: PatternOptions,
@@ -769,7 +804,7 @@ async setPatternBackground(buffer:Buffer, options: PatternOptions) {
    * @param y The y offset of the area.
    */
   async drawCheckerboardPattern(
-    ctx: any,
+    ctx: SKRSContext2D,
     width: number,
     height: number,
     options: PatternOptions,
@@ -798,7 +833,7 @@ async setPatternBackground(buffer:Buffer, options: PatternOptions) {
    * @param y The y offset of the area.
    */
   async drawCustomPattern(
-    ctx: any,
+    ctx: SKRSContext2D,
     width: number,
     height: number,
     options: PatternOptions,
@@ -857,7 +892,7 @@ async animate(
       const width = frame.width || defaultWidth;
       const height = frame.height || defaultHeight;
       const canvas = createCanvas(width, height);
-      const ctx: any = canvas.getContext('2d');
+      const ctx: SKRSContext2D = canvas.getContext('2d');
 
       if (!isNode) {
           canvas.width = width;
@@ -923,7 +958,7 @@ async animate(
       }
 
       if (frame.onDrawCustom) {
-          frame.onDrawCustom(ctx, canvas);
+          frame.onDrawCustom(ctx as unknown as CanvasRenderingContext2D, canvas);
       }
 
       if (frame.transformations) {
@@ -937,7 +972,7 @@ async animate(
          
           const frameDuration = frame.duration || defaultDuration;
           encoder.setDelay(frameDuration); 
-          encoder.addFrame(ctx); 
+          encoder.addFrame(ctx as unknown as CanvasRenderingContext2D); 
       }
 
       if (options?.onFrame) options.onFrame(i);

package/lib/canvas/utils/Background/bg.ts

@@ -0,0 +1,97 @@
+import { loadImage, SKRSContext2D } from "@napi-rs/canvas";
+import { CanvasConfig } from '../types';
+import path from 'path';
+
+
+/**
+ * Draws a gradient background on the canvas.
+ * No zoom logic is applied.
+ * @param ctx The canvas rendering context.
+ * @param canvas The canvas configuration object.
+ */
+export async function drawBackgroundGradient(ctx: SKRSContext2D, canvas: CanvasConfig): Promise<void> {
+    if (canvas.gradientBg) {
+      const {
+        type,
+        startX = 0,
+        startY = 0,
+        endX = canvas.width || 500,
+        endY = canvas.height || 500,
+        startRadius = 0,
+        endRadius = 0,
+        colors
+      } = canvas.gradientBg;
+  
+      if (!colors || colors.length === 0) {
+        throw new Error('You need to provide colors for the gradient.');
+      }
+  
+      let gradient;
+      if (type === 'linear' || type === undefined) {
+        gradient = ctx.createLinearGradient(startX, startY, endX, endY);
+      } else if (type === 'radial') {
+        gradient = ctx.createRadialGradient(startX, startY, startRadius, endX, endY, endRadius);
+      } else {
+        throw new Error('Unsupported gradient type.');
+      }
+  
+      for (const { stop, color } of colors) {
+        gradient.addColorStop(stop as number, color as string);
+      }
+  
+      const canvasWidth = canvas.width || 500;
+      const canvasHeight = canvas.height || 500;
+      ctx.fillStyle = gradient;
+      ctx.fillRect(0, 0, canvasWidth, canvasHeight);
+    }
+}
+  
+/**
+ * Draws a solid background color on the canvas.
+ * No zoom logic is applied.
+ * @param ctx The canvas rendering context.
+ * @param canvas The canvas configuration object.
+ */
+export async function drawBackgroundColor(ctx: SKRSContext2D, canvas: CanvasConfig): Promise<void> {
+    const canvasWidth = canvas.width || 500;
+    const canvasHeight = canvas.height || 500;
+  
+    // Fill the entire area starting at (0,0) (assuming translation is handled elsewhere)
+    if (canvas.colorBg !== 'transparent') {
+      ctx.fillStyle = canvas.colorBg as string;
+      ctx.fillRect(0, 0, canvasWidth, canvasHeight);
+    }
+}
+
+/**
+ * Draws a custom background image on the canvas.
+ * No zoom logic is applied.
+ * @param ctx The canvas rendering context.
+ * @param canvas The canvas configuration object.
+ */
+export async function customBackground(ctx: SKRSContext2D, canvas: CanvasConfig): Promise<void> {
+    if (canvas.customBg) {
+      try {
+        let imageBuffer: string;
+  
+        if (canvas.customBg.startsWith('http')) {
+          imageBuffer = canvas.customBg;
+        } else {
+          imageBuffer = path.join(process.cwd(), canvas.customBg);
+        }
+  
+        const image = await loadImage(imageBuffer);
+  
+        // Use canvas dimensions without additional x/y translation,
+        // because createCanvas already translated the context.
+        const canvasWidth = canvas.width || image.width;
+        const canvasHeight = canvas.height || image.height;
+  
+        // Draw the image so that it fills the canvas area relative to (0,0)
+        ctx.drawImage(image, 0, 0, canvasWidth, canvasHeight);
+  
+      } catch (error: any) {
+        console.error('Error loading custom background image:', error.message);
+      }
+    }
+}  

package/lib/canvas/utils/Background/circular.ts

@@ -0,0 +1,17 @@
+import { SKRSContext2D } from "@napi-rs/canvas";
+
+export function circularBorder(
+    ctx: SKRSContext2D,
+    width: number,
+    height: number,
+    radius: number = 0
+  ): void {
+    const minDimension = Math.min(width, height);
+    const clipRadius = minDimension / 2 + radius;
+    ctx.save();
+    ctx.beginPath();
+    ctx.arc(width / 2, height / 2, clipRadius, 0, Math.PI * 2);
+    ctx.closePath();
+    ctx.clip();
+  }
+  

package/lib/canvas/utils/Background/radius.ts

@@ -0,0 +1,113 @@
+import { SKRSContext2D } from "@napi-rs/canvas";
+
+/**
+ * Applies a radius border (clipping path) to the canvas context with support for selective corner rounding.
+ *
+ * @param ctx The canvas rendering context.
+ * @param x The x-coordinate of the rectangle.
+ * @param y The y-coordinate of the rectangle.
+ * @param width The width of the rectangle.
+ * @param height The height of the rectangle.
+ * @param radius The radius for rounding the corners.
+ * @param borderPosition Which corners to round. Valid values include:
+ *    - "all" (default)
+ *    - "top", "bottom", "left", "right"
+ *    - "top-left", "top-right", "bottom-left", "bottom-right"
+ *    - A comma-separated list, e.g. "top, left, bottom" (for three sides) or "top-left, bottom-right"
+ */
+export function radiusBorder(
+  ctx: SKRSContext2D,
+  x: number = 0,
+  y: number = 0,
+  width: number,
+  height: number,
+  radius: number = 0,
+  borderPosition: string = 'all'
+): void {
+  // Limit the radius to at most half the smallest dimension.
+  const minDimension = Math.min(width, height);
+  const maxRadius = minDimension / 2;
+  const clipRadius = Math.min(radius, maxRadius);
+
+  // Determine which corners should be rounded.
+  let roundTopLeft = false;
+  let roundTopRight = false;
+  let roundBottomRight = false;
+  let roundBottomLeft = false;
+
+  const bp = borderPosition.trim().toLowerCase();
+
+  // Simple keyword cases.
+  if (bp === 'all') {
+    roundTopLeft = roundTopRight = roundBottomRight = roundBottomLeft = true;
+  } else if (bp === 'top') {
+    roundTopLeft = roundTopRight = true;
+  } else if (bp === 'bottom') {
+    roundBottomLeft = roundBottomRight = true;
+  } else if (bp === 'left') {
+    roundTopLeft = roundBottomLeft = true;
+  } else if (bp === 'right') {
+    roundTopRight = roundBottomRight = true;
+  } else if (bp === 'top-left') {
+    roundTopLeft = true;
+  } else if (bp === 'top-right') {
+    roundTopRight = true;
+  } else if (bp === 'bottom-left') {
+    roundBottomLeft = true;
+  } else if (bp === 'bottom-right') {
+    roundBottomRight = true;
+  } else {
+    // For comma-separated lists.
+    const positions = bp.split(',').map(s => s.trim());
+    roundTopLeft =
+      positions.includes('top-left') || (positions.includes('top') && positions.includes('left'));
+    roundTopRight =
+      positions.includes('top-right') || (positions.includes('top') && positions.includes('right'));
+    roundBottomRight =
+      positions.includes('bottom-right') || (positions.includes('bottom') && positions.includes('right'));
+    roundBottomLeft =
+      positions.includes('bottom-left') || (positions.includes('bottom') && positions.includes('left'));
+  }
+
+  // Determine the effective radius for each corner.
+  const tl = roundTopLeft ? clipRadius : 0;
+  const tr = roundTopRight ? clipRadius : 0;
+  const br = roundBottomRight ? clipRadius : 0;
+  const bl = roundBottomLeft ? clipRadius : 0;
+
+  ctx.save();
+  ctx.beginPath();
+  // Start at top-left.
+  ctx.moveTo(x + tl, y);
+  // Top edge: move to top-right.
+  ctx.lineTo(x + width - tr, y);
+  if (tr > 0) {
+    ctx.quadraticCurveTo(x + width, y, x + width, y + tr);
+  } else {
+    ctx.lineTo(x + width, y);
+  }
+  // Right edge: move to bottom-right.
+  ctx.lineTo(x + width, y + height - br);
+  if (br > 0) {
+    ctx.quadraticCurveTo(x + width, y + height, x + width - br, y + height);
+  } else {
+    ctx.lineTo(x + width, y + height);
+  }
+  // Bottom edge: move to bottom-left.
+  ctx.lineTo(x + bl, y + height);
+  if (bl > 0) {
+    ctx.quadraticCurveTo(x, y + height, x, y + height - bl);
+  } else {
+    ctx.lineTo(x, y + height);
+  }
+  // Left edge: move back to top-left.
+  ctx.lineTo(x, y + tl);
+  if (tl > 0) {
+    ctx.quadraticCurveTo(x, y, x + tl, y);
+  } else {
+    ctx.lineTo(x, y);
+  }
+  ctx.closePath();
+  ctx.clip();
+  // Note: We do not call ctx.restore() here because we want the clipping region to remain.
+}

package/lib/canvas/utils/{charts.ts → Charts/charts.ts}

@@ -1,5 +1,5 @@
 import { createCanvas, loadImage } from '@napi-rs/canvas';
-import { barChart_1, bgConfig, DataItem, KeyBoxConfig, PieDataConfig, PieChartData, LineChartConfig, DataPoint } from "./types";
+import { barChart_1, bgConfig, DataItem, KeyBoxConfig, PieDataConfig, PieChartData, LineChartConfig, DataPoint } from "../types";
 import path from 'path';
 
 

package/lib/canvas/utils/{customLines.ts → Custom/customLines.ts}

@@ -1,4 +1,4 @@
-import { CustomOptions } from "./types";
+import { CustomOptions } from "../types";
 
 export function customLines(ctx: any, options: CustomOptions[]) {
     let previousEndCoordinates = null;

package/lib/canvas/utils/{conversion.ts → General/conversion.ts}

@@ -8,7 +8,7 @@ import  { ImgurClient } from "imgur";
        accessToken: "ad06eacb7c7228d8f482d2db20f490d649f58e52",
        refreshToken: "57fd64eeca315fcd25584fbbde91950bf17a7f5e"
     });
-
+  
     const response = await client.upload({
        image: base64(buffer),
        type: 'base64',