feat: add import model (janhq#2104)

Signed-off-by: James <[email protected]>
Co-authored-by: James <[email protected]>

core/src/api/index.ts

@@ -7,6 +7,7 @@ export enum NativeRoute {
   openAppDirectory = 'openAppDirectory',
   openFileExplore = 'openFileExplorer',
   selectDirectory = 'selectDirectory',
+  selectModelFiles = 'selectModelFiles',
   relaunch = 'relaunch',
 }
 
@@ -46,6 +47,13 @@ export enum DownloadEvent {
   onFileDownloadSuccess = 'onFileDownloadSuccess',
 }
 
+export enum LocalImportModelEvent {
+  onLocalImportModelUpdate = 'onLocalImportModelUpdate',
+  onLocalImportModelError = 'onLocalImportModelError',
+  onLocalImportModelSuccess = 'onLocalImportModelSuccess',
+  onLocalImportModelFinished = 'onLocalImportModelFinished',
+}
+
 export enum ExtensionRoute {
   baseExtensions = 'baseExtensions',
   getActiveExtensions = 'getActiveExtensions',
@@ -67,6 +75,7 @@ export enum FileSystemRoute {
 }
 export enum FileManagerRoute {
   syncFile = 'syncFile',
+  copyFile = 'copyFile',
   getJanDataFolderPath = 'getJanDataFolderPath',
   getResourcePath = 'getResourcePath',
   getUserHomePath = 'getUserHomePath',
@@ -126,4 +135,8 @@ export const CoreRoutes = [
 ]
 
 export const APIRoutes = [...CoreRoutes, ...Object.values(NativeRoute)]
-export const APIEvents = [...Object.values(AppEvent), ...Object.values(DownloadEvent)]
+export const APIEvents = [
+  ...Object.values(AppEvent),
+  ...Object.values(DownloadEvent),
+  ...Object.values(LocalImportModelEvent),
+]

core/src/extensions/model.ts

@@ -1,5 +1,5 @@
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
-import { Model, ModelInterface } from '../index'
+import { ImportingModel, Model, ModelInterface, OptionType } from '../index'
 
 /**
  * Model extension for managing models.
@@ -21,4 +21,6 @@ export abstract class ModelExtension extends BaseExtension implements ModelInter
   abstract saveModel(model: Model): Promise<void>
   abstract getDownloadedModels(): Promise<Model[]>
   abstract getConfiguredModels(): Promise<Model[]>
+  abstract importModels(models: ImportingModel[], optionType: OptionType): Promise<void>
+  abstract updateModelInfo(modelInfo: Partial<Model>): Promise<Model>
 }

core/src/fs.ts

@@ -69,14 +69,20 @@ const syncFile: (src: string, dest: string) => Promise<any> = (src, dest) =>
  */
 const copyFileSync = (...args: any[]) => global.core.api?.copyFileSync(...args)
 
+const copyFile: (src: string, dest: string) => Promise<void> = (src, dest) =>
+  global.core.api?.copyFile(src, dest)
+
 /**
  * Gets the file's stats.
  *
  * @param path - The path to the file.
+ * @param outsideJanDataFolder - Whether the file is outside the Jan data folder.
  * @returns {Promise<FileStat>} - A promise that resolves with the file's stats.
  */
-const fileStat: (path: string) => Promise<FileStat | undefined> = (path) =>
-  global.core.api?.fileStat(path)
+const fileStat: (path: string, outsideJanDataFolder?: boolean) => Promise<FileStat | undefined> = (
+  path,
+  outsideJanDataFolder
+) => global.core.api?.fileStat(path, outsideJanDataFolder)
 
 // TODO: Export `dummy` fs functions automatically
 // Currently adding these manually
@@ -90,6 +96,7 @@ export const fs = {
   unlinkSync,
   appendFileSync,
   copyFileSync,
+  copyFile,
   syncFile,
   fileStat,
   writeBlob,

core/src/node/api/processors/download.ts

@@ -50,7 +50,7 @@ export class Downloader implements Processor {
           fileName,
           downloadState: 'downloading',
         }
-        console.log('progress: ', downloadState)
+        console.debug('progress: ', downloadState)
         observer?.(DownloadEvent.onFileDownloadUpdate, downloadState)
         DownloadManager.instance.downloadProgressMap[modelId] = downloadState
       })

core/src/node/api/processors/fsExt.ts

@@ -1,6 +1,5 @@
 import { join } from 'path'
 import fs from 'fs'
-import { FileManagerRoute } from '../../../api'
 import { appResourcePath, normalizeFilePath } from '../../helper/path'
 import { getJanDataFolderPath, getJanDataFolderPath as getPath } from '../../helper'
 import { Processor } from './Processor'
@@ -48,10 +47,12 @@ export class FSExt implements Processor {
   }
 
   // handle fs is directory here
-  fileStat(path: string) {
+  fileStat(path: string, outsideJanDataFolder?: boolean) {
     const normalizedPath = normalizeFilePath(path)
 
-    const fullPath = join(getJanDataFolderPath(), normalizedPath)
+    const fullPath = outsideJanDataFolder
+      ? normalizedPath
+      : join(getJanDataFolderPath(), normalizedPath)
     const isExist = fs.existsSync(fullPath)
     if (!isExist) return undefined
 
@@ -75,4 +76,16 @@ export class FSExt implements Processor {
       console.error(`writeFile ${path} result: ${err}`)
     }
   }
+
+  copyFile(src: string, dest: string): Promise<void> {
+    return new Promise((resolve, reject) => {
+      fs.copyFile(src, dest, (err) => {
+        if (err) {
+          reject(err)
+        } else {
+          resolve()
+        }
+      })
+    })
+  }
 }

core/src/types/model/index.ts

@@ -1,3 +1,4 @@
 export * from './modelEntity'
 export * from './modelInterface'
 export * from './modelEvent'
+export * from './modelImport'

core/src/types/model/modelImport.ts

@@ -0,0 +1,22 @@
+export type OptionType = 'SYMLINK' | 'MOVE_BINARY_FILE'
+
+export type ModelImportOption = {
+  type: OptionType
+  title: string
+  description: string
+}
+
+export type ImportingModelStatus = 'PREPARING' | 'IMPORTING' | 'IMPORTED' | 'FAILED'
+
+export type ImportingModel = {
+  importId: string
+  modelId: string | undefined
+  name: string
+  description: string
+  path: string
+  tags: string[]
+  size: number
+  status: ImportingModelStatus
+  format: string
+  percentage?: number
+}

electron/handlers/native.ts

@@ -83,4 +83,22 @@ export function handleAppIPCs() {
       return filePaths[0]
     }
   })
+
+  ipcMain.handle(NativeRoute.selectModelFiles, async () => {
+    const mainWindow = WindowManager.instance.currentWindow
+    if (!mainWindow) {
+      console.error('No main window found')
+      return
+    }
+    const { canceled, filePaths } = await dialog.showOpenDialog(mainWindow, {
+      title: 'Select model files',
+      buttonLabel: 'Select',
+      properties: ['openFile', 'multiSelections'],
+    })
+    if (canceled) {
+      return
+    } else {
+      return filePaths
+    }
+  })
 }

electron/utils/dev.ts

@@ -8,10 +8,9 @@ export const setupReactDevTool = async () => {
     ) // Don't use import on top level, since the installer package is dev-only
     try {
       const name = await installExtension(REACT_DEVELOPER_TOOLS)
-      console.log(`Added Extension: ${name}`)
+      console.debug(`Added Extension: ${name}`)
     } catch (err) {
-      console.log('An error occurred while installing devtools:')
-      console.error(err)
+      console.error('An error occurred while installing devtools:', err)
       // Only log the error and don't throw it because it's not critical
     }
   }

electron/utils/log.ts

@@ -35,7 +35,7 @@ export function cleanLogs(
               console.error('Error deleting log file:', err)
               return
             }
-            console.log(
+            console.debug(
               `Deleted log file due to exceeding size limit: ${filePath}`
             )
           })
@@ -52,7 +52,7 @@ export function cleanLogs(
                 console.error('Error deleting log file:', err)
                 return
               }
-              console.log(`Deleted old log file: ${filePath}`)
+              console.debug(`Deleted old log file: ${filePath}`)
             })
           }
         }

extensions/inference-nitro-extension/src/node/accelerator.ts

@@ -149,7 +149,7 @@ export function updateCudaExistence(
 
   data['cuda'].exist = cudaExists
   data['cuda'].version = cudaVersion
-  console.log(data['is_initial'], data['gpus_in_use'])
+  console.debug(data['is_initial'], data['gpus_in_use'])
   if (cudaExists && data['is_initial'] && data['gpus_in_use'].length > 0) {
     data.run_mode = 'gpu'
   }