Merge branch 'dev' of https://github.com/janhq/cortex into readme

Author: irfanpena

cortex-js/package.json

@@ -71,7 +71,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.12.9",
     "@types/supertest": "^6.0.2",
-    "@types/update-notifier": "^5.0.8",
+    "@types/update-notifier": "^6.0.8",
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",

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

@@ -1,6 +1,13 @@
-import { CommandRunner, SubCommand, Option } from 'nest-commander';
+import {
+  CommandRunner,
+  SubCommand,
+  Option,
+  InquirerService,
+} from 'nest-commander';
 import { ChatCliUsecases } from './usecases/chat.cli.usecases';
 import { exit } from 'node:process';
+import { PSCliUsecases } from './usecases/ps.cli.usecases';
+import { ModelsUsecases } from '@/usecases/models/models.usecases';
 
 type ChatOptions = {
   threadId?: string;
@@ -10,22 +17,52 @@ type ChatOptions = {
 
 @SubCommand({ name: 'chat', description: 'Send a chat request to a model' })
 export class ChatCommand extends CommandRunner {
-  constructor(private readonly chatCliUsecases: ChatCliUsecases) {
+  constructor(
+    private readonly inquirerService: InquirerService,
+    private readonly chatCliUsecases: ChatCliUsecases,
+    private readonly modelsUsecases: ModelsUsecases,
+    private readonly psCliUsecases: PSCliUsecases,
+  ) {
     super();
   }
 
   async run(_input: string[], options: ChatOptions): Promise<void> {
-    const modelId = _input[0];
-    if (!modelId) {
-      console.error('Model ID is required');
-      exit(1);
+    let modelId = _input[0];
+    // First attempt to get message from input or options
+    let message = _input[1] ?? options.message;
+
+    // Check for model existing
+    if (!modelId || !(await this.modelsUsecases.findOne(modelId))) {
+      // Model ID is not provided
+      // first input might be message input
+      message = _input[0] ?? 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) {
+        modelId = models[0].modelId;
+      } else if (models.length > 0) {
+        const { model } = await this.inquirerService.inquirer.prompt({
+          type: 'list',
+          name: 'model',
+          message: 'Select running model to chat with:',
+          choices: models.map((e) => ({
+            name: e.modelId,
+            value: e.modelId,
+          })),
+        });
+        modelId = model;
+      } else {
+        console.error('Model ID is required');
+        exit(1);
+      }
     }
 
     return this.chatCliUsecases.chat(
       modelId,
       options.threadId,
-      options.message,
+      message, // Accept both message from inputs or arguments
       options.attach,
+      false, // Do not stop cortex session or loaded model
     );
   }
 
@@ -40,7 +77,6 @@ export class ChatCommand extends CommandRunner {
   @Option({
     flags: '-m, --message <message>',
     description: 'Message to send to the model',
-    required: true,
   })
   parseModelId(value: string) {
     return value;

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

@@ -1,14 +1,26 @@
-import { CommandRunner, SubCommand } from 'nest-commander';
+import { CommandRunner, SubCommand, Option } from 'nest-commander';
 import { ModelsCliUsecases } from '../usecases/models.cli.usecases';
 
+interface ModelListOptions {
+  format: 'table' | 'json';
+}
 @SubCommand({ name: 'list', description: 'List all models locally.' })
 export class ModelListCommand extends CommandRunner {
   constructor(private readonly modelsCliUsecases: ModelsCliUsecases) {
     super();
   }
 
-  async run(): Promise<void> {
+  async run(_input: string[], option: ModelListOptions): Promise<void> {
     const models = await this.modelsCliUsecases.listAllModels();
-    console.log(models);
+    option.format === 'table' ? console.table(models) : console.log(models);
+  }
+
+  @Option({
+    flags: '-f, --format <format>',
+    defaultValue: 'json',
+    description: 'Print models list in table or json format',
+  })
+  parseModelId(value: string) {
+    return value;
   }
 }

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

@@ -50,6 +50,7 @@ export class ModelPullCommand extends CommandRunner {
         name: sanitizedInput,
       };
 
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       for await (const _fileInfo of listFiles({ repo })) {
         break;
       }

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

@@ -14,7 +14,6 @@ export class ModelRemoveCommand extends CommandRunner {
       exit(1);
     }
 
-    const result = await this.modelsCliUsecases.removeModel(input[0]);
-    console.log(result);
+    await this.modelsCliUsecases.removeModel(input[0]).then(console.log);
   }
 }

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

@@ -1,14 +1,10 @@
 import { CommandRunner, SubCommand } from 'nest-commander';
 import { exit } from 'node:process';
 import { ModelsCliUsecases } from '../usecases/models.cli.usecases';
-import { CortexUsecases } from '@/usecases/cortex/cortex.usecases';
 
 @SubCommand({ name: 'stop', description: 'Stop a model by ID.' })
 export class ModelStopCommand extends CommandRunner {
-  constructor(
-    private readonly cortexUsecases: CortexUsecases,
-    private readonly modelsCliUsecases: ModelsCliUsecases,
-  ) {
+  constructor(private readonly modelsCliUsecases: ModelsCliUsecases) {
     super();
   }
 
@@ -20,7 +16,7 @@ export class ModelStopCommand extends CommandRunner {
 
     await this.modelsCliUsecases
       .stopModel(input[0])
-      .then(() => this.cortexUsecases.stopCortex())
+      .then(() => this.modelsCliUsecases.stopModel(input[0]))
       .then(console.log);
   }
 }

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

@@ -36,47 +36,12 @@ export class ChatCliUsecases {
     private readonly messagesUsecases: MessagesUsecases,
   ) {}
 
-  private async getOrCreateNewThread(
-    modelId: string,
-    threadId?: string,
-  ): Promise<Thread> {
-    if (threadId) {
-      const thread = await this.threadUsecases.findOne(threadId);
-      if (!thread) throw new Error(`Cannot find thread with id: ${threadId}`);
-      return thread;
-    }
-
-    const model = await this.modelsUsecases.findOne(modelId);
-    if (!model) throw new Error(`Cannot find model with id: ${modelId}`);
-
-    const assistant = await this.assistantUsecases.findOne('jan');
-    if (!assistant) throw new Error('No assistant available');
-
-    const createThreadModel: CreateThreadModelInfoDto = {
-      id: modelId,
-      settings: model.settings,
-      parameters: model.parameters,
-    };
-
-    const assistantDto: CreateThreadAssistantDto = {
-      assistant_id: assistant.id,
-      assistant_name: assistant.name,
-      model: createThreadModel,
-    };
-
-    const createThreadDto: CreateThreadDto = {
-      title: 'New Thread',
-      assistants: [assistantDto],
-    };
-
-    return this.threadUsecases.create(createThreadDto);
-  }
-
   async chat(
     modelId: string,
     threadId?: string,
     message?: string,
     attach: boolean = true,
+    stopModel: boolean = true,
   ): Promise<void> {
     if (attach) console.log(`Inorder to exit, type '${this.exitClause}'.`);
     const thread = await this.getOrCreateNewThread(modelId, threadId);
@@ -95,11 +60,10 @@ export class ChatCliUsecases {
     if (message) sendCompletionMessage.bind(this)(message);
     if (attach) rl.prompt();
 
-    rl.on('close', () => {
-      this.cortexUsecases.stopCortex().then(() => {
-        if (attach) console.log(this.exitMessage);
-        exit(0);
-      });
+    rl.on('close', async () => {
+      if (stopModel) await this.modelsUsecases.stopModel(modelId);
+      if (attach) console.log(this.exitMessage);
+      exit(0);
     });
 
     rl.on('line', sendCompletionMessage.bind(this));
@@ -213,4 +177,40 @@ export class ChatCliUsecases {
         });
     }
   }
+
+  private async getOrCreateNewThread(
+    modelId: string,
+    threadId?: string,
+  ): Promise<Thread> {
+    if (threadId) {
+      const thread = await this.threadUsecases.findOne(threadId);
+      if (!thread) throw new Error(`Cannot find thread with id: ${threadId}`);
+      return thread;
+    }
+
+    const model = await this.modelsUsecases.findOne(modelId);
+    if (!model) throw new Error(`Cannot find model with id: ${modelId}`);
+
+    const assistant = await this.assistantUsecases.findOne('jan');
+    if (!assistant) throw new Error('No assistant available');
+
+    const createThreadModel: CreateThreadModelInfoDto = {
+      id: modelId,
+      settings: model.settings,
+      parameters: model.parameters,
+    };
+
+    const assistantDto: CreateThreadAssistantDto = {
+      assistant_id: assistant.id,
+      assistant_name: assistant.name,
+      model: createThreadModel,
+    };
+
+    const createThreadDto: CreateThreadDto = {
+      title: 'New Thread',
+      assistants: [assistantDto],
+    };
+
+    return this.threadUsecases.create(createThreadDto);
+  }
 }

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

@@ -8,6 +8,7 @@ import { InitOptions } from '../types/init-options.interface';
 import { Injectable } from '@nestjs/common';
 import { firstValueFrom } from 'rxjs';
 import { FileManagerService } from '@/file-manager/file-manager.service';
+import { rm } from 'fs/promises';
 
 @Injectable()
 export class InitCliUsecases {
@@ -105,6 +106,7 @@ export class InitCliUsecases {
       console.error('Error decompressing file', e);
       exit(1);
     }
+    await rm(destination, { force: true });
   };
 
   parseEngineFileName = (options: InitOptions) => {
@@ -228,5 +230,6 @@ export class InitCliUsecases {
       console.log(e);
       exit(1);
     }
+    await rm(destination, { force: true });
   };
 }