chore: move db and models folder to dist

Signed-off-by: James <namnh0122@gmail.com>

Author: namchuai

cortex-js/.env.development

@@ -1,3 +1,2 @@
 EXTENSIONS_PATH=<EXTENSIONS_PATH>
 CORTEX_MODELS_DIR=<CORTEX_MODELS_DIR>
-CORTEX_BINARY_PATH=<CORTEX_BINARY_PATH>

cortex-js/.env.example

@@ -1,16 +1,13 @@
-
 import { CommandRunner, InquirerService, SubCommand } from 'nest-commander';
 import { InitCliUsecases } from './usecases/init.cli.usecases';
 import { InitOptions } from './types/init-options.interface';
 
-
 @SubCommand({
   name: 'init',
   aliases: ['setup'],
   description: "Init settings and download cortex's dependencies",
 })
 export class InitCommand extends CommandRunner {
-
   constructor(
     private readonly inquirerService: InquirerService,
     private readonly initUsecases: InitCliUsecases,
@@ -19,15 +16,18 @@ export class InitCommand extends CommandRunner {
   }
 
   async run(input: string[], options?: InitOptions): Promise<void> {
-    options = await this.inquirerService.ask('init-run-mode-questions', options);
+    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);
     }
 
     const version = input[0] ?? 'latest';
 
-    const engineFileName = this.initUsecases.parseEngineFileName(options)
+    const engineFileName = this.initUsecases.parseEngineFileName(options);
     await this.initUsecases.installEngine(engineFileName, version);
 
     if (options.installCuda === 'Yes') {

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

@@ -140,9 +140,9 @@ export class ModelsCliUsecases {
         let stopWord = '';
         try {
           const { metadata } = await gguf(downloadUrl);
-          // @ts-ignore
+          // @ts-expect-error "tokenizer.ggml.eos_token_id"
           const index = metadata['tokenizer.ggml.eos_token_id'];
-          // @ts-ignore
+          // @ts-expect-error "tokenizer.ggml.tokens"
           stopWord = metadata['tokenizer.ggml.tokens'][index] ?? '';
           data.siblings[i].stopWord = stopWord;
         } catch (err) {

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

@@ -1,13 +1,15 @@
 import { databaseFile } from 'constant';
+import { resolve } from 'path';
 import { DataSource } from 'typeorm';
 
 export const sqliteDatabaseProviders = [
   {
     provide: 'DATA_SOURCE',
     useFactory: async () => {
+      const sqlitePath = resolve(__dirname, `../../../${databaseFile}`);
       const dataSource = new DataSource({
         type: 'sqlite',
-        database: databaseFile,
+        database: sqlitePath,
         synchronize: process.env.NODE_ENV !== 'production',
         entities: [__dirname + '/../**/*.entity{.ts,.js}'],
       });

cortex-js/src/infrastructure/database/sqlite-database.providers.ts

@@ -3,7 +3,6 @@ import { OAIEngineExtension } from '@/domain/abstracts/oai.abstract';
 import { PromptTemplate } from '@/domain/models/prompt-template.interface';
 import { join, resolve } from 'path';
 import { Model, ModelSettingParams } from '@/domain/models/model.interface';
-import { ConfigService } from '@nestjs/config';
 import { HttpService } from '@nestjs/axios';
 import { defaultCortexCppHost, defaultCortexCppPort } from 'constant';
 import { readdirSync } from 'node:fs';
@@ -21,20 +20,17 @@ export default class CortexProvider extends OAIEngineExtension {
   private loadModelUrl = `http://${defaultCortexCppHost}:${defaultCortexCppPort}/inferences/server/loadmodel`;
   private unloadModelUrl = `http://${defaultCortexCppHost}:${defaultCortexCppPort}/inferences/server/unloadmodel`;
 
-  constructor(
-    private readonly configService: ConfigService,
-    protected readonly httpService: HttpService,
-  ) {
+  constructor(protected readonly httpService: HttpService) {
     super(httpService);
   }
 
+  modelDir = () => resolve(__dirname, `../../../models`);
+
   override async loadModel(
     model: Model,
     settings?: ModelSettingParams,
   ): Promise<void> {
-    const modelsContainerDir =
-      this.configService.get<string>('CORTEX_MODELS_DIR') ??
-      resolve('./models');
+    const modelsContainerDir = this.modelDir();
 
     const modelFolderFullPath = join(modelsContainerDir, model.id);
     const ggufFiles = readdirSync(modelFolderFullPath).filter((file) => {
@@ -47,7 +43,7 @@ export default class CortexProvider extends OAIEngineExtension {
 
     const modelBinaryLocalPath = join(modelFolderFullPath, ggufFiles[0]);
 
-    const cpuThreadCount = 1; // TODO: NamH Math.max(1, nitroResourceProbe.numCpuPhysicalCore);
+    const cpuThreadCount = 1; // TODO: Math.max(1, nitroResourceProbe.numCpuPhysicalCore);
     const modelSettings = {
       // This is critical and requires real CPU physical core count (or performance core)
       model: model.id,

cortex-js/src/infrastructure/providers/cortex/cortex.provider.ts

@@ -10,7 +10,7 @@ import { existsSync } from 'node:fs';
 export class CortexUsecases {
   private cortexProcess: ChildProcess | undefined;
 
-  constructor(private readonly httpService: HttpService) { }
+  constructor(private readonly httpService: HttpService) {}
 
   async startCortex(
     host: string = defaultCortexCppHost,
@@ -24,7 +24,11 @@ export class CortexUsecases {
     }
 
     const args: string[] = ['1', host, `${port}`];
-    const cortexCppPath = join(__dirname, '../../../cortex-cpp/cortex-cpp' + `${process.platform === 'win32' ? '.exe' : ''}`);
+    const cortexCppPath = join(
+      __dirname,
+      '../../../cortex-cpp/cortex-cpp' +
+        `${process.platform === 'win32' ? '.exe' : ''}`,
+    );
 
     if (!existsSync(cortexCppPath)) {
       throw new Error('Cortex binary not found');
@@ -85,7 +89,7 @@ export class CortexUsecases {
   }
 
   private registerCortexEvents() {
-    this.cortexProcess?.on('spawn', () => { });
+    this.cortexProcess?.on('spawn', () => {});
 
     this.cortexProcess?.on('message', (message) => {
       console.log('Cortex process message', message);

cortex-js/src/usecases/cortex/cortex.usecases.ts

@@ -5,7 +5,7 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { Repository } from 'typeorm';
 import { Model, ModelFormat } from '@/domain/models/model.interface';
 import { ModelNotFoundException } from '@/infrastructure/exception/model-not-found.exception';
-import { join, basename } from 'path';
+import { join, basename, resolve } from 'path';
 import {
   promises,
   createWriteStream,
@@ -14,7 +14,6 @@ import {
   rmdirSync,
 } from 'fs';
 import { StartModelSuccessDto } from '@/infrastructure/dtos/models/start-model-success.dto';
-import { ConfigService } from '@nestjs/config';
 import { ExtensionRepository } from '@/domain/repositories/extension.interface';
 import { EngineExtension } from '@/domain/abstracts/engine.abstract';
 import { HttpService } from '@nestjs/axios';
@@ -26,7 +25,6 @@ export class ModelsUsecases {
     @Inject('MODEL_REPOSITORY')
     private readonly modelRepository: Repository<ModelEntity>,
     private readonly extensionRepository: ExtensionRepository,
-    private readonly configService: ConfigService,
     private readonly httpService: HttpService,
   ) {}
 
@@ -65,8 +63,7 @@ export class ModelsUsecases {
   }
 
   async remove(id: string) {
-    const modelsContainerDir =
-      this.configService.get<string>('CORTEX_MODELS_DIR') ?? './models';
+    const modelsContainerDir = this.modelDir();
 
     if (!existsSync(modelsContainerDir)) {
       return;
@@ -150,6 +147,8 @@ export class ModelsUsecases {
       });
   }
 
+  modelDir = () => resolve(__dirname, `../../../models`);
+
   async downloadModel(modelId: string, callback?: (progress: number) => void) {
     const model = await this.getModelOrThrow(modelId);
 
@@ -165,8 +164,7 @@ export class ModelsUsecases {
     }
 
     const fileName = basename(downloadUrl);
-    const modelsContainerDir =
-      this.configService.get<string>('CORTEX_MODELS_DIR') ?? './models';
+    const modelsContainerDir = this.modelDir();
 
     if (!existsSync(modelsContainerDir)) {
       mkdirSync(modelsContainerDir, { recursive: true });