fix: pull corresponding engine base on model

Author: louis-jan

cortex-js/src/infrastructure/commanders/models/model-pull.command.ts

@@ -35,8 +35,16 @@ export class ModelPullCommand extends CommandRunner {
     }
     const modelId = passedParams[0];
 
+    await this.modelsCliUsecases.pullModel(modelId).catch((e: Error) => {
+      if (e instanceof ModelNotFoundException)
+        console.error('Model does not exist.');
+      else console.error(e);
+      exit(1);
+    });
+
     const existingModel = await this.modelsCliUsecases.getModel(modelId);
     const engine = existingModel?.engine || 'cortex.llamacpp';
+
     // Pull engine if not exist
     if (
       !existsSync(
@@ -45,16 +53,11 @@ export class ModelPullCommand extends CommandRunner {
     ) {
       await this.initUsecases.installEngine(
         await this.initUsecases.defaultInstallationOptions(),
+        'latest',
+        engine,
       );
     }
 
-    await this.modelsCliUsecases.pullModel(modelId).catch((e: Error) => {
-      if (e instanceof ModelNotFoundException)
-        console.error('Model does not exist.');
-      else console.error(e);
-      exit(1);
-    });
-
     console.log('\nDownload complete!');
     exit(0);
   }

cortex-js/src/infrastructure/commanders/models/model-start.command.ts

@@ -69,6 +69,8 @@ export class ModelStartCommand extends CommandRunner {
     ) {
       await this.initUsecases.installEngine(
         await this.initUsecases.defaultInstallationOptions(),
+        'latest',
+        engine,
       );
     }
     await this.cortexUsecases

cortex-js/src/infrastructure/commanders/usecases/init.cli.usecases.ts

@@ -52,12 +52,41 @@ export class InitCliUsecases {
   installEngine = async (
     options: InitOptions,
     version: string = 'latest',
+    engine: string = 'default',
     force: boolean = true,
   ): Promise<any> => {
     const configs = await this.fileManagerService.getConfig();
 
     if (configs.initialized && !force) return;
 
+    // Ship Llama.cpp engine by default
+    if (
+      !existsSync(
+        join(
+          await this.fileManagerService.getDataFolderPath(),
+          'engines',
+          engine,
+        ),
+      )
+    )
+      await this.installLlamaCppEngine(options, version);
+
+    if (engine === 'cortex.onnx')
+      if (process.platform === 'win32') await this.installONNXEngine();
+
+    configs.initialized = true;
+    await this.fileManagerService.writeConfigFile(configs);
+  };
+
+  /**
+   * Install Llama.cpp engine
+   * @param options
+   * @param version
+   */
+  private installLlamaCppEngine = async (
+    options: InitOptions,
+    version: string = 'latest',
+  ) => {
     const engineFileName = this.parseEngineFileName(options);
 
     const res = await firstValueFrom(
@@ -148,12 +177,6 @@ export class InitCliUsecases {
     if (options.runMode === 'GPU' && !(await cudaVersion())) {
       await this.installCudaToolkitDependency(options.cudaVersion);
     }
-
-    // Ship ONNX Runtime on Windows by default
-    if (process.platform === 'win32') await this.installONNXEngine();
-
-    configs.initialized = true;
-    await this.fileManagerService.writeConfigFile(configs);
   };
 
   /**

cortex-js/src/infrastructure/commanders/usecases/models.cli.usecases.ts

@@ -152,7 +152,7 @@ export class ModelsCliUsecases {
 
   /**
    * It's to pull ONNX model from HuggingFace repository
-   * @param modelId 
+   * @param modelId
    */
   private async pullOnnxModel(modelId: string) {
     const modelsContainerDir = await this.fileService.getModelsPath();
@@ -179,7 +179,6 @@ export class ModelsCliUsecases {
       console.log(`Downloading ${file}`);
       const bar = new SingleBar({}, Presets.shades_classic);
       bar.start(100, 0);
-
       const response = await firstValueFrom(
         this.httpService.get(
           `https://huggingface.co/cortexhub/${repo}/resolve/${branch}/${file}?download=true`,
@@ -219,7 +218,7 @@ export class ModelsCliUsecases {
       readFileSync(join(modelFolder, 'model.yml'), 'utf-8'),
     ) as CreateModelDto;
     model.files = [join(modelFolder)];
-    model.model = modelId
+    model.model = modelId;
 
     if (!(await this.modelsUsecases.findOne(modelId)))
       await this.modelsUsecases.create(model);
@@ -290,8 +289,8 @@ export class ModelsCliUsecases {
 
   /**
    * Parse preset file
-   * @param preset 
-   * @returns 
+   * @param preset
+   * @returns
    */
   private async parsePreset(preset?: string): Promise<object> {
     const presetsFolder = await this.fileService.getPresetsPath();