refactor: shorten cortex setup - save cortex cpp serve configs (#747)

Author: louis-jan

cortex-js/package.json

@@ -10,11 +10,11 @@
   },
   "scripts": {
     "dev": "nest dev",
-    "build": "yarn build:extensions && nest build && cpx \"cpuinfo/bin/**\" dist/bin",
-    "build:binary": "run-script-os",
-    "build:binary:windows": "bun build --compile --target=bun-windows-x64 ./dist/src/command.js --outfile cortex.exe --external @nestjs/microservices --external @nestjs/websockets/socket-module --external class-transformer/storage",
-    "build:binary:linux": "bun build --compile --target=bun-linux-x64 ./dist/src/command.js --outfile cortex --external @nestjs/microservices --external @nestjs/websockets/socket-module --external class-transformer/storage",
-    "build:binary:macos": "bun build --compile --target=bun-darwin-arm64 ./dist/src/command.js --outfile cortex --external @nestjs/microservices --external @nestjs/websockets/socket-module --external class-transformer/storage",
+    "build": "nest build && cpx \"cpuinfo/bin/**\" dist/bin",
+    "build:binary": "run-script-os && cpx \"cpuinfo/bin/**\" dist/bin",
+    "build:binary:windows": "bun build --compile --target=bun-windows-x64 ./src/command.ts --outfile cortex.exe --external @nestjs/microservices --external @nestjs/websockets/socket-module --external class-transformer/storage",
+    "build:binary:linux": "bun build --compile --target=bun-linux-x64 ./src/command.ts --outfile cortex --external @nestjs/microservices --external @nestjs/websockets/socket-module --external class-transformer/storage",
+    "build:binary:macos": "bun build --compile --target=bun-darwin-arm64 ./src/command.ts --outfile cortex --external @nestjs/microservices --external @nestjs/websockets/socket-module --external class-transformer/storage",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "build:extensions": "run-script-os",
     "build:extensions:windows": "powershell -command \"$jobs = Get-ChildItem -Path './src/extensions' -Directory | ForEach-Object { Start-Job -Name ($_.Name) -ScriptBlock { param($_dir); try { Set-Location $_dir; yarn; yarn build; Write-Output 'Build successful in ' + $_dir } catch { Write-Error 'Error in ' + $_dir; throw } } -ArgumentList $_.FullName }; $jobs | Wait-Job; $jobs | ForEach-Object { Receive-Job -Job $_ -Keep } | ForEach-Object { Write-Host $_ }; $failed = $jobs | Where-Object { $_.State -ne 'Completed' -or $_.ChildJobs[0].JobStateInfo.State -ne 'Completed' }; if ($failed) { Exit 1 }\"",

cortex-js/src/app.module.ts

@@ -15,7 +15,6 @@ import { AppLoggerMiddleware } from './infrastructure/middlewares/app.logger.mid
 import { TelemetryModule } from './usecases/telemetry/telemetry.module';
 import { APP_FILTER } from '@nestjs/core';
 import { GlobalExceptionFilter } from './infrastructure/exception/global.exception';
-import { UtilModule } from './util/util.module';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { EventsController } from './infrastructure/controllers/events.controller';
 import { AssistantsController } from './infrastructure/controllers/assistants.controller';
@@ -26,6 +25,7 @@ import { ThreadsController } from './infrastructure/controllers/threads.controll
 import { StatusController } from './infrastructure/controllers/status.controller';
 import { ProcessController } from './infrastructure/controllers/process.controller';
 import { DownloadManagerModule } from './infrastructure/services/download-manager/download-manager.module';
+import { ContextModule } from './infrastructure/services/context/context.module';
 
 @Module({
   imports: [
@@ -48,7 +48,7 @@ import { DownloadManagerModule } from './infrastructure/services/download-manage
     ExtensionModule,
     FileManagerModule,
     TelemetryModule,
-    UtilModule,
+    ContextModule,
     DownloadManagerModule,
   ],
   controllers: [

cortex-js/src/command.module.ts

@@ -18,7 +18,6 @@ import { ModelStopCommand } from './infrastructure/commanders/models/model-stop.
 import { ModelGetCommand } from './infrastructure/commanders/models/model-get.command';
 import { ModelRemoveCommand } from './infrastructure/commanders/models/model-remove.command';
 import { RunCommand } from './infrastructure/commanders/shortcuts/run.command';
-import { InitCudaQuestions } from './infrastructure/commanders/questions/cuda.questions';
 import { ModelUpdateCommand } from './infrastructure/commanders/models/model-update.command';
 import { AssistantsModule } from './usecases/assistants/assistants.module';
 import { CliUsecasesModule } from './infrastructure/commanders/usecases/cli.usecases.module';
@@ -29,12 +28,12 @@ import { KillCommand } from './infrastructure/commanders/kill.command';
 import { PresetCommand } from './infrastructure/commanders/presets.command';
 import { TelemetryModule } from './usecases/telemetry/telemetry.module';
 import { TelemetryCommand } from './infrastructure/commanders/telemetry.command';
-import { UtilModule } from './util/util.module';
 import { EmbeddingCommand } from './infrastructure/commanders/embeddings.command';
 import { BenchmarkCommand } from './infrastructure/commanders/benchmark.command';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { DownloadManagerModule } from './infrastructure/services/download-manager/download-manager.module';
 import { ServeStopCommand } from './infrastructure/commanders/sub-commands/serve-stop.command';
+import { ContextModule } from './infrastructure/services/context/context.module';
 
 @Module({
   imports: [
@@ -54,7 +53,7 @@ import { ServeStopCommand } from './infrastructure/commanders/sub-commands/serve
     MessagesModule,
     FileManagerModule,
     TelemetryModule,
-    UtilModule,
+    ContextModule,
     DownloadManagerModule,
   ],
   providers: [
@@ -71,7 +70,6 @@ import { ServeStopCommand } from './infrastructure/commanders/sub-commands/serve
 
     // Questions
     InitRunModeQuestions,
-    InitCudaQuestions,
 
     // Model commands
     ModelStartCommand,

cortex-js/src/command.ts

@@ -4,7 +4,7 @@ import { CommandModule } from './command.module';
 import { TelemetryUsecases } from './usecases/telemetry/telemetry.usecases';
 import { TelemetrySource } from './domain/telemetry/telemetry.interface';
 import { AsyncLocalStorage } from 'async_hooks';
-import { ContextService } from './util/context.service';
+import { ContextService } from '@/infrastructure/services/context/context.service';
 
 export const asyncLocalStorage = new AsyncLocalStorage();
 

cortex-js/src/domain/config/config.interface.ts

@@ -1,3 +1,6 @@
 export interface Config {
   dataFolderPath: string;
+  initialized: boolean;
+  cortexCppHost: string;
+  cortexCppPort: number;
 }

cortex-js/src/infrastructure/commanders/chat.command.ts

@@ -9,8 +9,8 @@ import { exit } from 'node:process';
 import { PSCliUsecases } from './usecases/ps.cli.usecases';
 import { ModelsUsecases } from '@/usecases/models/models.usecases';
 import { SetCommandContext } from './decorators/CommandContext';
-import { ContextService } from '@/util/context.service';
 import { ModelStat } from './types/model-stat.interface';
+import { ContextService } from '../services/context/context.service';
 
 type ChatOptions = {
   threadId?: string;

cortex-js/src/infrastructure/commanders/cortex-command.commander.ts

@@ -11,11 +11,11 @@ import pkg from '@/../package.json';
 import { PresetCommand } from './presets.command';
 import { TelemetryCommand } from './telemetry.command';
 import { SetCommandContext } from './decorators/CommandContext';
-import { ContextService } from '@/util/context.service';
 import { EmbeddingCommand } from './embeddings.command';
 import { BenchmarkCommand } from './benchmark.command';
 import chalk from 'chalk';
 import { printSlogan } from '@/utils/logo';
+import { ContextService } from '../services/context/context.service';
 
 @RootCommand({
   subCommands: [

cortex-js/src/infrastructure/commanders/init.command.ts

@@ -7,7 +7,7 @@ import {
 import { InitCliUsecases } from './usecases/init.cli.usecases';
 import { InitOptions } from './types/init-options.interface';
 import { SetCommandContext } from './decorators/CommandContext';
-import { ContextService } from '@/util/context.service';
+import { ContextService } from '../services/context/context.service';
 
 @SubCommand({
   name: 'init',
@@ -30,59 +30,20 @@ export class InitCommand extends CommandRunner {
 
   async run(passedParams: string[], options?: InitOptions): Promise<void> {
     if (options?.silent) {
-      return this.initSilently(passedParams);
+      const installationOptions =
+        await this.initUsecases.defaultInstallationOptions();
+      return this.initUsecases.installEngine(installationOptions);
     } else {
-      return this.initPrompts(passedParams, options);
-    }
-  }
+      options = await this.inquirerService.ask(
+        'init-run-mode-questions',
+        options,
+      );
 
-  private initSilently = async (
-    passedParams: string[],
-    options: InitOptions = {},
-  ) => {
-    const version = passedParams[0] ?? 'latest';
-    if (process.platform === 'darwin') {
-      const engineFileName = this.initUsecases.parseEngineFileName(options);
-      return this.initUsecases.installEngine(engineFileName, version);
-    }
-    // If Nvidia Driver is installed -> GPU
-    options.runMode = (await this.initUsecases.checkNvidiaGPUExist())
-      ? 'GPU'
-      : 'CPU';
-    // CPU Instructions detection
-    options.gpuType = 'Nvidia';
-    options.instructions = await this.initUsecases.detectInstructions();
-    const engineFileName = this.initUsecases.parseEngineFileName(options);
-    return this.initUsecases
-      .installEngine(engineFileName, version)
-      .then(() => this.initUsecases.installCudaToolkitDependency(options));
-  };
+      const version = passedParams[0] ?? 'latest';
 
-  /**
-   * Manual initalization
-   * To setup cortex's dependencies
-   * @param input
-   * @param options GPU | CPU / Nvidia | Others (Vulkan) / AVX | AVX2 | AVX512
-   */
-  private initPrompts = async (input: string[], options?: InitOptions) => {
-    options = await this.inquirerService.ask(
-      'init-run-mode-questions',
-      options,
-    );
-
-    if (options.runMode === 'GPU' && !(await this.initUsecases.cudaVersion())) {
-      options = await this.inquirerService.ask('init-cuda-questions', options);
+      await this.initUsecases.installEngine(options, version);
     }
-
-    const version = input[0] ?? 'latest';
-
-    const engineFileName = this.initUsecases.parseEngineFileName(options);
-    await this.initUsecases.installEngine(engineFileName, version);
-
-    if (options.installCuda === 'Yes') {
-      await this.initUsecases.installCudaToolkitDependency(options);
-    }
-  };
+  }
 
   @Option({
     flags: '-s, --silent',

cortex-js/src/infrastructure/commanders/kill.command.ts

@@ -1,7 +1,7 @@
 import { CommandRunner, SubCommand } from 'nest-commander';
 import { CortexUsecases } from '@/usecases/cortex/cortex.usecases';
 import { SetCommandContext } from './decorators/CommandContext';
-import { ContextService } from '@/util/context.service';
+import { ContextService } from '../services/context/context.service';
 
 @SubCommand({
   name: 'kill',
@@ -16,6 +16,6 @@ export class KillCommand extends CommandRunner {
     super();
   }
   async run(): Promise<void> {
-    this.usecases.stopCortex().then(console.log);
+    return this.usecases.stopCortex().then(console.log);
   }
 }

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

@@ -1,8 +1,8 @@
 import { CommandRunner, SubCommand } from 'nest-commander';
 import { ModelsCliUsecases } from '@commanders/usecases/models.cli.usecases';
 import { exit } from 'node:process';
-import { ContextService } from '@/util/context.service';
 import { SetCommandContext } from '../decorators/CommandContext';
+import { ContextService } from '@/infrastructure/services/context/context.service';
 
 @SubCommand({
   name: 'get',