opencomic-ai-bin 1.0.1 → 1.0.3

package/README.md

@@ -31,6 +31,9 @@ import OpenComicAI from 'opencomic-ai-bin';
 
 (async () => {
 
+	// Set the base directory for binary paths, for example change to app.asar.unpacked path in Electron apps
+	OpenComicAI.setDirname(OpenComicAI.__dirname.replace(/app(-(?:arm64|x64))?\.asar/, 'app$1.asar.unpacked'));
+
 	// Models path, if the model is not found in this folder, it will be downloaded
 	OpenComicAI.setModelsPath('./models');
 
@@ -68,6 +71,14 @@ import OpenComicAI from 'opencomic-ai-bin';
 })();
 ```
 
+### OpenComicAI.setDirname
+
+Set the base directory for binary paths.
+
+```ts
+OpenComicAI.setDirname(dirname: string): void
+```
+
 ### OpenComicAI.setModelsPath
 
 Set the directory where models will be downloaded and stored.
@@ -76,6 +87,14 @@ Set the directory where models will be downloaded and stored.
 OpenComicAI.setModelsPath(path: string): void
 ```
 
+### OpenComicAI.\_\_dirname
+
+Get the base directory for binary paths.
+
+```ts
+OpenComicAI.__dirname: string
+```
+
 ### OpenComicAI.models
 
 Object containing all available models organized by type (upscale, descreen, artifact-removal).
@@ -125,6 +144,7 @@ OpenComicAI.model(model: Model): ModelObject
 ```
 
 ### OpenComicAI.pipeline
+
 Process an image through one or more AI models.
 
 ```ts
@@ -137,6 +157,14 @@ OpenComicAI.pipeline(
 ): Promise<string>
 ```
 
+### OpenComicAI.closest
+
+Returns the value in the array closest to the target value.
+
+```ts
+OpenComicAI.closest(array: number[], target: number): number
+```
+
 ## Types
 
 ### `Model`

package/dist/calculate-latency.mjs

@@ -164,7 +164,7 @@ let models = {
         'waifu2x-models-cunet': {
             name: 'Waifu2x CUnet',
             upscaler: 'waifu2x',
-            scales: [1, 2, 4, 8, 16, 32],
+            scales: [/*1, */ 2, 4, 8, 16, 32],
             noise: [0, 1, 2, 3],
             latency: 2.92,
             folder: './waifu2x/models-cunet',
@@ -192,7 +192,7 @@ let models = {
         'waifu2x-models-upconv': {
             name: 'Waifu2x UpConv',
             upscaler: 'waifu2x',
-            scales: [1, 2, 4, 8, 16, 32],
+            scales: [/*1, */ 2, 4, 8, 16, 32],
             noise: [0, 1, 2, 3],
             latency: 0.8,
             folder: './waifu2x/models-upconv_7_anime_style_art_rgb',
@@ -486,6 +486,7 @@ class OpenComicAI {
     static modelsList = modelsList;
     static modelsTypeList = modelsTypeList;
     static modelsPath = undefined;
+    static __dirname = ___dirname;
     static resolve = (path) => {
         if (!p.isAbsolute(path)) {
             if (typeof module !== 'undefined')
@@ -501,6 +502,9 @@ class OpenComicAI {
             throw new Error(`Models path does not exist: ${path}`);
         OpenComicAI.modelsPath = path;
     };
+    static setDirname = (dirname) => {
+        OpenComicAI.__dirname = OpenComicAI.resolve(dirname);
+    };
     static model = (model = DEFAULT_MODEL) => {
         if (!modelsList.includes(model))
             throw new Error(`Model not found: ${model}`);
@@ -515,7 +519,7 @@ class OpenComicAI {
     static binary = (model) => {
         if (!modelsList.includes(model))
             throw new Error(`Model not found: ${model}`);
-        const base = p.join(___dirname, '..');
+        const base = p.join(OpenComicAI.__dirname, '..');
         const upscaler = OpenComicAI.model(model).upscaler;
         const result = upscalers[upscaler].platforms[process.platform]?.[process.arch] ?? upscalers[upscaler].platforms[process.platform]?.x64 ?? upscalers[upscaler].platforms.linux?.x64 ?? '';
         return p.join(base, result);

package/dist/index.cjs

@@ -166,7 +166,7 @@ let models = {
         'waifu2x-models-cunet': {
             name: 'Waifu2x CUnet',
             upscaler: 'waifu2x',
-            scales: [1, 2, 4, 8, 16, 32],
+            scales: [/*1, */ 2, 4, 8, 16, 32],
             noise: [0, 1, 2, 3],
             latency: 2.92,
             folder: './waifu2x/models-cunet',
@@ -194,7 +194,7 @@ let models = {
         'waifu2x-models-upconv': {
             name: 'Waifu2x UpConv',
             upscaler: 'waifu2x',
-            scales: [1, 2, 4, 8, 16, 32],
+            scales: [/*1, */ 2, 4, 8, 16, 32],
             noise: [0, 1, 2, 3],
             latency: 0.8,
             folder: './waifu2x/models-upconv_7_anime_style_art_rgb',
@@ -488,6 +488,7 @@ class OpenComicAI {
     static modelsList = modelsList;
     static modelsTypeList = modelsTypeList;
     static modelsPath = undefined;
+    static __dirname = ___dirname;
     static resolve = (path) => {
         if (!p.isAbsolute(path)) {
             if (typeof module !== 'undefined')
@@ -503,6 +504,9 @@ class OpenComicAI {
             throw new Error(`Models path does not exist: ${path}`);
         OpenComicAI.modelsPath = path;
     };
+    static setDirname = (dirname) => {
+        OpenComicAI.__dirname = OpenComicAI.resolve(dirname);
+    };
     static model = (model = DEFAULT_MODEL) => {
         if (!modelsList.includes(model))
             throw new Error(`Model not found: ${model}`);
@@ -517,7 +521,7 @@ class OpenComicAI {
     static binary = (model) => {
         if (!modelsList.includes(model))
             throw new Error(`Model not found: ${model}`);
-        const base = p.join(___dirname, '..');
+        const base = p.join(OpenComicAI.__dirname, '..');
         const upscaler = OpenComicAI.model(model).upscaler;
         const result = upscalers[upscaler].platforms[process.platform]?.[process.arch] ?? upscalers[upscaler].platforms[process.platform]?.x64 ?? upscalers[upscaler].platforms.linux?.x64 ?? '';
         return p.join(base, result);

package/dist/index.d.ts

@@ -42,14 +42,16 @@ declare class OpenComicAI {
     static modelsList: string[];
     static modelsTypeList: Record<ModelType, string[]>;
     static modelsPath: string | undefined;
+    static __dirname: any;
     private static resolve;
     static setModelsPath: (path: string) => void;
+    static setDirname: (dirname: string) => void;
     static model: (model?: Model) => ModelObject;
     static binary: (model: Model) => string;
     private static download;
     private static getModels;
     static pipeline: (source: string, dest: string, steps: OpenComicAIOptions[], progress?: ((progress?: number) => void) | false, downloading?: Downloading | false) => Promise<string>;
-    private static closest;
+    static closest: (array: number[], target: number) => number;
     private static image;
 }
 

package/dist/index.mjs

@@ -164,7 +164,7 @@ let models = {
         'waifu2x-models-cunet': {
             name: 'Waifu2x CUnet',
             upscaler: 'waifu2x',
-            scales: [1, 2, 4, 8, 16, 32],
+            scales: [/*1, */ 2, 4, 8, 16, 32],
             noise: [0, 1, 2, 3],
             latency: 2.92,
             folder: './waifu2x/models-cunet',
@@ -192,7 +192,7 @@ let models = {
         'waifu2x-models-upconv': {
             name: 'Waifu2x UpConv',
             upscaler: 'waifu2x',
-            scales: [1, 2, 4, 8, 16, 32],
+            scales: [/*1, */ 2, 4, 8, 16, 32],
             noise: [0, 1, 2, 3],
             latency: 0.8,
             folder: './waifu2x/models-upconv_7_anime_style_art_rgb',
@@ -486,6 +486,7 @@ class OpenComicAI {
     static modelsList = modelsList;
     static modelsTypeList = modelsTypeList;
     static modelsPath = undefined;
+    static __dirname = ___dirname;
     static resolve = (path) => {
         if (!p.isAbsolute(path)) {
             if (typeof module !== 'undefined')
@@ -501,6 +502,9 @@ class OpenComicAI {
             throw new Error(`Models path does not exist: ${path}`);
         OpenComicAI.modelsPath = path;
     };
+    static setDirname = (dirname) => {
+        OpenComicAI.__dirname = OpenComicAI.resolve(dirname);
+    };
     static model = (model = DEFAULT_MODEL) => {
         if (!modelsList.includes(model))
             throw new Error(`Model not found: ${model}`);
@@ -515,7 +519,7 @@ class OpenComicAI {
     static binary = (model) => {
         if (!modelsList.includes(model))
             throw new Error(`Model not found: ${model}`);
-        const base = p.join(___dirname, '..');
+        const base = p.join(OpenComicAI.__dirname, '..');
         const upscaler = OpenComicAI.model(model).upscaler;
         const result = upscalers[upscaler].platforms[process.platform]?.[process.arch] ?? upscalers[upscaler].platforms[process.platform]?.x64 ?? upscalers[upscaler].platforms.linux?.x64 ?? '';
         return p.join(base, result);

package/index.mts

@@ -212,7 +212,7 @@ let models: Record<ModelType, Record<string, ModelObject>> = {
 		'waifu2x-models-cunet': {
 			name: 'Waifu2x CUnet',
 			upscaler: 'waifu2x',
-			scales: [1, 2, 4, 8, 16, 32],
+			scales: [/*1, */2, 4, 8, 16, 32],
 			noise: [0, 1, 2, 3],
 			latency: 2.92,
 			folder: './waifu2x/models-cunet',
@@ -240,7 +240,7 @@ let models: Record<ModelType, Record<string, ModelObject>> = {
 		'waifu2x-models-upconv': {
 			name: 'Waifu2x UpConv',
 			upscaler: 'waifu2x',
-			scales: [1, 2, 4, 8, 16, 32],
+			scales: [/*1, */2, 4, 8, 16, 32],
 			noise: [0, 1, 2, 3],
 			latency: 0.8,
 			folder: './waifu2x/models-upconv_7_anime_style_art_rgb',
@@ -566,6 +566,7 @@ export default class OpenComicAI {
 	public static modelsList = modelsList;
 	public static modelsTypeList = modelsTypeList;
 	public static modelsPath: string | undefined = undefined;
+	public static __dirname = ___dirname;
 
 	private static resolve = (path: string): string => {
 
@@ -592,6 +593,12 @@ export default class OpenComicAI {
 
 	}
 
+	public static setDirname = (dirname: string): void => {
+
+		OpenComicAI.__dirname = OpenComicAI.resolve(dirname);
+
+	}
+
 	public static model = (model: Model = DEFAULT_MODEL): ModelObject => {
 
 		if(!modelsList.includes(model as Model))
@@ -612,7 +619,7 @@ export default class OpenComicAI {
 		if(!modelsList.includes(model as Model))
 			throw new Error(`Model not found: ${model}`);
 
-		const base = p.join(___dirname, '..');
+		const base = p.join(OpenComicAI.__dirname, '..');
 
 		const upscaler = OpenComicAI.model(model as Model).upscaler;
 		const result = upscalers[upscaler].platforms[process.platform]?.[process.arch] ?? upscalers[upscaler].platforms[process.platform]?.x64 ?? upscalers[upscaler].platforms.linux?.x64 ?? '';
@@ -787,7 +794,7 @@ export default class OpenComicAI {
 
 	}
 
-	private static closest = (array: number[], target: number): number => {
+	public static closest = (array: number[], target: number): number => {
 
 		return array.reduce((prev, curr) => {
 			return Math.abs(curr - target) < Math.abs(prev - target) ? curr : prev;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "opencomic-ai-bin",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"description": "Upscale and dehalftone images using AI models like Real-CUGAN, Real-ESRGAN, Waifu2x and Upscayl.",
 	"main": "index.mts",
 	"type": "module",