fix: gate ONNX on other OSs

Author: louis-jan

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

@@ -47,10 +47,9 @@ export class ModelPullCommand extends CommandRunner {
 
     // Pull engine if not exist
     if (
-      !existsSync(
-        join(await this.fileService.getDataFolderPath(), 'engines', engine),
-      )
+      !existsSync(join(await this.fileService.getCortexCppEnginePath(), engine))
     ) {
+      console.log('\n');
       await this.initUsecases.installEngine(
         await this.initUsecases.defaultInstallationOptions(),
         'latest',

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

@@ -63,16 +63,18 @@ export class ModelStartCommand extends CommandRunner {
     const engine = existingModel.engine || 'cortex.llamacpp';
     // Pull engine if not exist
     if (
-      !existsSync(
-        join(await this.fileService.getDataFolderPath(), 'engines', engine),
-      )
+      !existsSync(join(await this.fileService.getCortexCppEnginePath(), engine))
     ) {
       await this.initUsecases.installEngine(
         await this.initUsecases.defaultInstallationOptions(),
         'latest',
         engine,
       );
     }
+    if (engine === 'cortex.onnx' && process.platform !== 'win32') {
+      console.error('The ONNX engine does not support this OS yet.');
+      process.exit(1);
+    }
     await this.cortexUsecases
       .startCortex(options.attach)
       .then(() => this.modelsCliUsecases.startModel(modelId, options.preset))

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

@@ -63,16 +63,19 @@ export class InitCliUsecases {
     if (
       !existsSync(
         join(
-          await this.fileManagerService.getDataFolderPath(),
-          'engines',
-          engine,
+          await this.fileManagerService.getCortexCppEnginePath(),
+          'cortex.llamacpp',
         ),
       )
     )
       await this.installLlamaCppEngine(options, version);
 
-    if (engine === 'cortex.onnx')
-      if (process.platform === 'win32') await this.installONNXEngine();
+    if (engine === 'cortex.onnx' && process.platform === 'win32')
+      await this.installONNXEngine();
+    else if (engine === 'cortex.onnx' && process.platform !== 'win32') {
+      console.error('The ONNX engine does not support this OS yet.');
+      process.exit(1);
+    }
 
     configs.initialized = true;
     await this.fileManagerService.writeConfigFile(configs);

cortex-js/src/infrastructure/services/file-manager/file-manager.service.ts

@@ -234,13 +234,21 @@ export class FileManagerService {
   /**
    * Get the benchmark folder path
    * Usually it is located at the home directory > cortex > extensions
-   * @returns the path to the extensions folder
+   * @returns the path to the benchmark folder
    */
   async getBenchmarkPath(): Promise<string> {
     const dataFolderPath = await this.getDataFolderPath();
     return join(dataFolderPath, this.benchmarkFoldername);
   }
 
+  /**
+   * Get Cortex CPP engines folder path
+   * @returns the path to the cortex engines folder
+   */
+  async getCortexCppEnginePath(): Promise<string> {
+    return join(await this.getDataFolderPath(), 'cortex-cpp', 'engines');
+  }
+
   async createFolderIfNotExistInDataFolder(folderName: string): Promise<void> {
     const dataFolderPath = await this.getDataFolderPath();
     const folderPath = join(dataFolderPath, folderName);