refactor: inject model cli use cases - support quantization selection

Author: louis-jan

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

@@ -5,7 +5,7 @@ import { exit } from 'node:process';
 
 @SubCommand({ name: 'get', description: 'Get a model by ID.' })
 export class ModelGetCommand extends CommandRunner {
-  constructor(private readonly modelsUsecases: ModelsUsecases) {
+  constructor(private readonly modelsCliUsecases: ModelsCliUsecases) {
     super();
   }
 
@@ -15,8 +15,7 @@ export class ModelGetCommand extends CommandRunner {
       exit(1);
     }
 
-    const modelsCliUsecases = new ModelsCliUsecases(this.modelsUsecases);
-    const models = await modelsCliUsecases.getModel(input[0]);
+    const models = await this.modelsCliUsecases.getModel(input[0]);
     console.log(models);
   }
 }

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

@@ -4,13 +4,12 @@ import { ModelsCliUsecases } from '../usecases/models.cli.usecases';
 
 @SubCommand({ name: 'list', description: 'List all models locally.' })
 export class ModelListCommand extends CommandRunner {
-  constructor(private readonly modelsUsecases: ModelsUsecases) {
+  constructor(private readonly modelsCliUsecases: ModelsCliUsecases) {
     super();
   }
 
   async run(): Promise<void> {
-    const modelsCliUsecases = new ModelsCliUsecases(this.modelsUsecases);
-    const models = await modelsCliUsecases.listAllModels();
+    const models = await this.modelsCliUsecases.listAllModels();
     console.log(models);
   }
 }

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

@@ -1,4 +1,3 @@
-import { ModelsUsecases } from '@/usecases/models/models.usecases';
 import { CommandRunner, SubCommand } from 'nest-commander';
 import { Presets, SingleBar } from 'cli-progress';
 import { exit } from 'node:process';
@@ -10,7 +9,7 @@ import { ModelsCliUsecases } from '../usecases/models.cli.usecases';
   description: 'Download a model. Working with HuggingFace model id.',
 })
 export class ModelPullCommand extends CommandRunner {
-  constructor(private readonly modelsUsecases: ModelsUsecases) {
+  constructor(private readonly modelsCliUsecases: ModelsCliUsecases) {
     super();
   }
 
@@ -25,7 +24,7 @@ export class ModelPullCommand extends CommandRunner {
     const callback = (progress: number) => {
       bar.update(progress);
     };
-    await new ModelsCliUsecases(this.modelsUsecases).pullModel(
+    await this.modelsCliUsecases.pullModel(
       input[0],
       callback,
     );

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

@@ -1,11 +1,10 @@
-import { ModelsUsecases } from '@/usecases/models/models.usecases';
 import { CommandRunner, SubCommand } from 'nest-commander';
 import { ModelsCliUsecases } from '../usecases/models.cli.usecases';
 import { exit } from 'node:process';
 
 @SubCommand({ name: 'remove', description: 'Remove a model by ID locally.' })
 export class ModelRemoveCommand extends CommandRunner {
-  constructor(private readonly modelsUsecases: ModelsUsecases) {
+  constructor(private readonly modelsCliUsecases: ModelsCliUsecases) {
     super();
   }
 
@@ -15,8 +14,7 @@ export class ModelRemoveCommand extends CommandRunner {
       exit(1);
     }
 
-    const modelsCliUsecases = new ModelsCliUsecases(this.modelsUsecases);
-    const result = await modelsCliUsecases.removeModel(input[0]);
+    const result = await this.modelsCliUsecases.removeModel(input[0]);
     console.log(result);
   }
 }

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

@@ -1,4 +1,3 @@
-import { ModelsUsecases } from '@/usecases/models/models.usecases';
 import { CommandRunner, SubCommand } from 'nest-commander';
 import { exit } from 'node:process';
 import { ModelsCliUsecases } from '../usecases/models.cli.usecases';
@@ -7,8 +6,8 @@ import { CortexUsecases } from '@/usecases/cortex/cortex.usecases';
 @SubCommand({ name: 'start', description: 'Start a model by ID.' })
 export class ModelStartCommand extends CommandRunner {
   constructor(
-    private readonly modelsUsecases: ModelsUsecases,
     private readonly cortexUsecases: CortexUsecases,
+    private readonly modelsCliUsecases: ModelsCliUsecases,
   ) {
     super();
   }
@@ -20,7 +19,6 @@ export class ModelStartCommand extends CommandRunner {
     }
 
     await this.cortexUsecases.startCortex();
-    const modelsCliUsecases = new ModelsCliUsecases(this.modelsUsecases);
-    await modelsCliUsecases.startModel(input[0]);
+    await this.modelsCliUsecases.startModel(input[0]);
   }
 }

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

@@ -1,4 +1,3 @@
-import { ModelsUsecases } from '@/usecases/models/models.usecases';
 import { CommandRunner, SubCommand } from 'nest-commander';
 import { exit } from 'node:process';
 import { ModelsCliUsecases } from '../usecases/models.cli.usecases';
@@ -7,8 +6,8 @@ import { CortexUsecases } from '@/usecases/cortex/cortex.usecases';
 @SubCommand({ name: 'stop', description: 'Stop a model by ID.' })
 export class ModelStopCommand extends CommandRunner {
   constructor(
-    private readonly modelsUsecases: ModelsUsecases,
     private readonly cortexUsecases: CortexUsecases,
+    private readonly modelsCliUsecases: ModelsCliUsecases,
   ) {
     super();
   }
@@ -19,8 +18,7 @@ export class ModelStopCommand extends CommandRunner {
       exit(1);
     }
 
-    const modelsCliUsecases = new ModelsCliUsecases(this.modelsUsecases);
-    await modelsCliUsecases.stopModel(input[0]);
+    await this.modelsCliUsecases.stopModel(input[0]);
     await this.cortexUsecases.stopCortex();
   }
 }

cortex-js/src/infrastructure/commanders/questions/hugging-face.questions.ts

@@ -1,11 +1,13 @@
 import { Module } from "@nestjs/common";
 import { InitCliUsecases } from "./init.cli.usecases";
 import { HttpModule } from "@nestjs/axios";
+import { ModelsCliUsecases } from "./models.cli.usecases";
+import { ModelsModule } from "@/usecases/models/models.module";
 
 @Module({
-    imports: [HttpModule],
+    imports: [HttpModule, ModelsModule],
     controllers: [],
-    providers: [InitCliUsecases],
-    exports: [InitCliUsecases],
+    providers: [InitCliUsecases, ModelsCliUsecases],
+    exports: [InitCliUsecases, ModelsCliUsecases],
   })
   export class CliUsecasesModule {}

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

@@ -4,6 +4,8 @@ import { Model, ModelFormat } from '@/domain/models/model.interface';
 import { CreateModelDto } from '@/infrastructure/dtos/models/create-model.dto';
 import { HuggingFaceRepoData } from '@/domain/models/huggingface.interface';
 import { gguf } from '@huggingface/gguf';
+import { InquirerService } from 'nest-commander';
+import { Inject, Injectable } from '@nestjs/common';
 
 const AllQuantizations = [
   'Q3_K_S',
@@ -28,9 +30,13 @@ const AllQuantizations = [
   'COPY',
 ];
 
-// TODO: make this class injectable
+@Injectable()
 export class ModelsCliUsecases {
-  constructor(private readonly modelsUsecases: ModelsUsecases) {}
+  constructor(
+    private readonly modelsUsecases: ModelsUsecases,
+    @Inject(InquirerService)
+    private readonly inquirerService: InquirerService,
+  ) {}
 
   async startModel(modelId: string): Promise<void> {
     await this.getModelOrStop(modelId);
@@ -75,10 +81,16 @@ export class ModelsCliUsecases {
 
   private async pullHuggingFaceModel(modelId: string) {
     const data = await this.fetchHuggingFaceRepoData(modelId);
-    // TODO: add select options
-    const sibling = data.siblings.filter(
-      (e: any) => e.quantization == 'Q5_K_M',
-    )[0];
+    const { quantization } = await this.inquirerService.inquirer.prompt({
+      type: 'list',
+      name: 'quantization',
+      message: 'Select quantization',
+      choices: data.siblings.map((e) => e.quantization).filter((e) => !!e),
+    });
+
+    const sibling = data.siblings.filter((e) => !!e.quantization).find(
+      (e: any) => e.quantization === quantization,
+    );
 
     if (!sibling) throw 'No expected quantization found';
     const stopWords: string[] = [];