fix: failed tests (#702)

Co-authored-by: Van-QA <van@jan.ai>

Author: louis-jan

cortex-js/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@janhq/cortex",
   "version": "0.0.1",
-  "description": "",
-  "author": "",
+  "description": "Cortex is an openAI-compatible local AI server that developers can use to build LLM apps. It is packaged with a Docker-inspired command-line interface and a Typescript client library. It can be used as a standalone server, or imported as a library.",
+  "author": "Jan <service@jan.ai>",
   "license": "AGPL-3.0",
+  "homepage": "https://github.com/janhq/cortex",
   "bin": {
     "cortex": "./dist/src/command.js"
   },
@@ -114,7 +115,8 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node",
     "moduleNameMapper": {
-      "@/(.*)$": "<rootDir>/$1"
+      "@/(.*)$": "<rootDir>/$1",
+      "@commanders/(.*)$": "<rootDir>/../src/infrastructure/commanders/$1"
     }
   }
 }

cortex-js/src/app.module.ts

@@ -17,7 +17,6 @@ import { AppLoggerMiddleware } from './infrastructure/middlewares/app.logger.mid
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { DownloadManagerModule } from './download-manager/download-manager.module';
 import { EventsController } from './infrastructure/controllers/events.controller';
-import { AppController } from './infrastructure/controllers/app.controller';
 import { AssistantsController } from './infrastructure/controllers/assistants.controller';
 import { ChatController } from './infrastructure/controllers/chat.controller';
 import { EmbeddingsController } from './infrastructure/controllers/embeddings.controller';
@@ -49,7 +48,6 @@ import { ProcessController } from './infrastructure/controllers/process.controll
     DownloadManagerModule,
   ],
   controllers: [
-    AppController,
     AssistantsController,
     ChatController,
     EmbeddingsController,

cortex-js/src/command.module.ts

@@ -31,6 +31,7 @@ import { EmbeddingCommand } from './infrastructure/commanders/embeddings.command
 import { BenchmarkCommand } from './infrastructure/commanders/benchmark.command';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { DownloadManagerModule } from './download-manager/download-manager.module';
+import { ServeStopCommand } from './infrastructure/commanders/sub-commands/serve-stop.command';
 
 @Module({
   imports: [
@@ -78,6 +79,9 @@ import { DownloadManagerModule } from './download-manager/download-manager.modul
 
     // Shortcuts
     RunCommand,
+
+    // Serve
+    ServeStopCommand,
   ],
 })
 export class CommandModule {}

cortex-js/src/download-manager/download-manager.service.spec.ts

@@ -1,11 +1,14 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { DownloadManagerService } from './download-manager.service';
+import { HttpModule } from '@nestjs/axios';
+import { EventEmitterModule } from '@nestjs/event-emitter';
 
 describe('DownloadManagerService', () => {
   let service: DownloadManagerService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
+      imports: [HttpModule, EventEmitterModule.forRoot()],
       providers: [DownloadManagerService],
     }).compile();
 

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

@@ -4,7 +4,10 @@ import { BenchmarkConfig } from './types/benchmark-config.interface';
 
 @SubCommand({
   name: 'benchmark',
-  subCommands: [],
+  arguments: '[model_id]',
+  argsDescription: {
+    model_id: 'Model to benchmark with',
+  },
   description:
     'Benchmark and analyze the performance of a specific AI model using a variety of system resources',
 })
@@ -14,10 +17,13 @@ export class BenchmarkCommand extends CommandRunner {
   }
 
   async run(
-    _input: string[],
+    passedParams: string[],
     options?: Partial<BenchmarkConfig>,
   ): Promise<void> {
-    return this.benchmarkUsecases.benchmark(options ?? {});
+    return this.benchmarkUsecases.benchmark({
+      ...options,
+      ...(passedParams[0] ? { modelId: passedParams[0] } : {}),
+    });
   }
 
   @Option({

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

@@ -16,7 +16,16 @@ type ChatOptions = {
   attach: boolean;
 };
 
-@SubCommand({ name: 'chat', description: 'Send a chat request to a model' })
+@SubCommand({
+  name: 'chat',
+  description: 'Send a chat request to a model',
+  arguments: '[model_id] [message]',
+  argsDescription: {
+    model_id:
+      'Model ID to chat with. If there is no model_id provided, it will prompt to select from running models.',
+    message: 'Message to send to the model',
+  },
+})
 export class ChatCommand extends CommandRunner {
   constructor(
     private readonly inquirerService: InquirerService,
@@ -27,17 +36,19 @@ export class ChatCommand extends CommandRunner {
     super();
   }
 
-  async run(_input: string[], options: ChatOptions): Promise<void> {
-    let modelId = _input[0];
+  async run(passedParams: string[], options: ChatOptions): Promise<void> {
+    let modelId = passedParams[0];
     // First attempt to get message from input or options
     // Extract input from 1 to end of array
-    let message = options.message ?? _input.slice(1).join(' ');
+    let message = options.message ?? passedParams.slice(1).join(' ');
 
     // Check for model existing
     if (!modelId || !(await this.modelsUsecases.findOne(modelId))) {
       // Model ID is not provided
       // first input might be message input
-      message = _input.length ? _input.join(' ') : options.message ?? '';
+      message = passedParams.length
+        ? passedParams.join(' ')
+        : options.message ?? '';
       // If model ID is not provided, prompt user to select from running models
       const models = await this.psCliUsecases.getModels();
       if (models.length === 1) {

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

@@ -1,4 +1,4 @@
-import { RootCommand, CommandRunner, Option } from 'nest-commander';
+import { RootCommand, CommandRunner } from 'nest-commander';
 import { ServeCommand } from './serve.command';
 import { ChatCommand } from './chat.command';
 import { ModelsCommand } from './models.command';
@@ -11,10 +11,9 @@ import pkg from '@/../package.json';
 import { PresetCommand } from './presets.command';
 import { EmbeddingCommand } from './embeddings.command';
 import { BenchmarkCommand } from './benchmark.command';
+import chalk from 'chalk';
+import { printSlogan } from '@/utils/logo';
 
-interface CortexCommandOptions {
-  version: boolean;
-}
 @RootCommand({
   subCommands: [
     ModelsCommand,
@@ -32,17 +31,12 @@ interface CortexCommandOptions {
   description: 'Cortex CLI',
 })
 export class CortexCommand extends CommandRunner {
-  async run(input: string[], option: CortexCommandOptions): Promise<void> {
-    if (option.version) console.log(pkg.version);
-  }
-
-  @Option({
-    flags: '-v, --version',
-    description: 'Cortex version',
-    defaultValue: false,
-    name: 'version',
-  })
-  parseVersion() {
-    return true;
+  async run(): Promise<void> {
+    printSlogan();
+    console.log('\n');
+    console.log(`Cortex CLI - v${pkg.version}`);
+    console.log(chalk.blue(`Github: ${pkg.homepage}`));
+    console.log('\n');
+    this.command?.help();
   }
 }

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

@@ -18,7 +18,12 @@ interface EmbeddingCommandOptions {
 
 @SubCommand({
   name: 'embeddings',
+  arguments: '[model_id]',
   description: 'Creates an embedding vector representing the input text.',
+  argsDescription: {
+    model_id:
+      'Model to use for embedding. If not provided, it will prompt to select from running models.',
+  },
 })
 export class EmbeddingCommand extends CommandRunner {
   constructor(
@@ -29,16 +34,19 @@ export class EmbeddingCommand extends CommandRunner {
   ) {
     super();
   }
-  async run(_input: string[], options: EmbeddingCommandOptions): Promise<void> {
-    let modelId = _input[0];
+  async run(
+    passedParams: string[],
+    options: EmbeddingCommandOptions,
+  ): Promise<void> {
+    let modelId = passedParams[0];
     // First attempt to get message from input or options
-    let input: string | string[] = options.input ?? _input.splice(1);
+    let input: string | string[] = options.input ?? passedParams.splice(1);
 
     // Check for model existing
     if (!modelId || !(await this.modelsUsecases.findOne(modelId))) {
       // Model ID is not provided
       // first input might be message input
-      input = _input ?? options.input;
+      input = passedParams ?? options.input;
       // If model ID is not provided, prompt user to select from running models
       const models = await this.psCliUsecases.getModels();
       if (models.length === 1) {

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

@@ -10,7 +10,11 @@ import { InitOptions } from './types/init-options.interface';
 @SubCommand({
   name: 'init',
   aliases: ['setup'],
+  arguments: '[version]',
   description: "Init settings and download cortex's dependencies",
+  argsDescription: {
+    version: 'Version of cortex engine',
+  },
 })
 export class InitCommand extends CommandRunner {
   constructor(
@@ -20,16 +24,19 @@ export class InitCommand extends CommandRunner {
     super();
   }
 
-  async run(input: string[], options?: InitOptions): Promise<void> {
+  async run(passedParams: string[], options?: InitOptions): Promise<void> {
     if (options?.silent) {
-      return this.initSilently(input);
+      return this.initSilently(passedParams);
     } else {
-      return this.initPrompts(input, options);
+      return this.initPrompts(passedParams, options);
     }
   }
 
-  private initSilently = async (input: string[], options: InitOptions = {}) => {
-    const version = input[0] ?? 'latest';
+  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);

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

@@ -2,19 +2,26 @@ import { CommandRunner, SubCommand } from 'nest-commander';
 import { ModelsCliUsecases } from '@commanders/usecases/models.cli.usecases';
 import { exit } from 'node:process';
 
-@SubCommand({ name: 'get', description: 'Get a model by ID.' })
+@SubCommand({
+  name: 'get',
+  description: 'Get a model by ID.',
+  arguments: '<model_id>',
+  argsDescription: {
+    model_id: 'Model ID to get information about.',
+  },
+})
 export class ModelGetCommand extends CommandRunner {
   constructor(private readonly modelsCliUsecases: ModelsCliUsecases) {
     super();
   }
 
-  async run(input: string[]): Promise<void> {
-    if (input.length === 0) {
+  async run(passedParams: string[]): Promise<void> {
+    if (passedParams.length === 0) {
       console.error('Model ID is required');
       exit(1);
     }
 
-    const model = await this.modelsCliUsecases.getModel(input[0]);
+    const model = await this.modelsCliUsecases.getModel(passedParams[0]);
     if (!model) console.error('Model not found');
     else console.log(model);
   }