@solidstarters/solid-core 1.2.192 → 1.2.200

package/src/commands/mcp.command.ts

@@ -0,0 +1,215 @@
+import { Command, CommandRunner, Option } from 'nest-commander';
+import { Logger } from '@nestjs/common';
+import { spawn } from 'child_process';
+import * as path from 'path';
+import * as fs from 'fs';
+import { SolidRegistry } from 'src/helpers/solid-registry';
+import { ISolidDatabaseModule } from 'src/interfaces';
+import { DatasourceType } from 'src/dtos/create-model-metadata.dto';
+
+interface McpCommandOptions {
+    repoPath?: string;
+    detached?: boolean;
+}
+
+@Command({
+    name: 'mcp',
+    description: 'Manage the SolidX MCP server and Celery worker docker containers (start/stop)',
+})
+export class McpCommand extends CommandRunner {
+    private readonly logger = new Logger(McpCommand.name);
+
+    constructor(
+        private readonly solidRegistry: SolidRegistry
+    ) {
+        super();
+    }
+
+    async run(passedParams: string[], options?: McpCommandOptions): Promise<void> {
+        const mode = (passedParams[0] || 'start').toLowerCase();
+
+        if (mode === 'stop') {
+            await this.stopContainers(options);
+        } else if (mode === 'start') {
+            await this.startContainers(options);
+        } else {
+            this.logger.error(
+                `Unknown mode "${mode}". Supported modes are: start, stop.\n` +
+                'Examples:\n' +
+                '  solid mcp start -p ~/mcp/servers/solidx_mcp_server\n' +
+                '  solid mcp stop  -p ~/mcp/servers/solidx_mcp_server\n'
+            );
+        }
+    }
+
+    // ---------------------------------------------------------------
+    // START
+    // ---------------------------------------------------------------
+    private async startContainers(options?: McpCommandOptions): Promise<void> {
+        // 1. Validate license key
+        const apiKey = process.env.MCP_API_KEY;
+
+        // Form the Database url to be used by the MCP server based on the consuming projects details. 
+        const defaultDatabaseUser = process.env.DEFAULT_DATABASE_USER;
+        const defaultDatabasePwd = process.env.DEFAULT_DATABASE_PASSWORD
+            ? encodeURIComponent(process.env.DEFAULT_DATABASE_PASSWORD)
+            : '';
+        const defaultDatabaseHost = process.env.DEFAULT_DATABASE_HOST === 'localhost' ? 'host.docker.internal' : process.env.DEFAULT_DATABASE_HOST;
+        const defaultDatabaseName = process.env.DEFAULT_DATABASE_NAME;
+        const databaseDialect = process.env.DEFAULT_DATABASE_TYPE?.toLowerCase() === 'mssql' ? 'mssql+pyodbc' : 'postgresql';
+        // const databaseUrl = `${databaseDialect}://${defaultDatabaseUser}:${defaultDatabasePwd}@${defaultDatabaseHost}/${defaultDatabaseName}`;
+
+        const defaultDatasource: ISolidDatabaseModule = this.solidRegistry.getDefaultSolidDatabaseModule()
+
+        let databaseUrl: string;
+        if (defaultDatasource.type() === DatasourceType.mssql) {
+            const base = `mssql+pyodbc://${defaultDatabaseUser}:${defaultDatabasePwd}@${defaultDatabaseHost}/${defaultDatabaseName}`;
+            const driver = encodeURIComponent('ODBC Driver 18 for SQL Server');
+            databaseUrl = `${base}?driver=${driver}&TrustServerCertificate=yes`;
+        }
+        if (defaultDatasource.type() === DatasourceType.postgres) {
+            databaseUrl = `postgresql://${defaultDatabaseUser}:${defaultDatabasePwd}@${defaultDatabaseHost}/${defaultDatabaseName}`;
+        }
+
+        if (!apiKey || apiKey.trim() === '') {
+            this.logger.error(
+                '❌ MCP_API_KEY environment variable is missing.\n' +
+                'Set it before running:\n' +
+                '   export MCP_API_KEY="your_license_key"\n'
+            );
+            return;
+        }
+
+        this.logger.log('✔ MCP_API_KEY found.');
+
+        // 2. Resolve paths
+        const repoPath = options?.repoPath ? this.resolvePath(options.repoPath) : process.cwd();
+        const consumingProjectPath = path.resolve(process.cwd(), '..');
+        const composeFile = path.join(repoPath, 'docker-compose.yml');
+
+        if (!fs.existsSync(composeFile)) {
+            this.logger.error(`docker-compose.yml not found at ${composeFile}`);
+            return;
+        }
+
+        const detached = options?.detached ?? false;
+
+        this.logger.log(`Mode: start`);
+        this.logger.log(`Using repo path: ${repoPath}`);
+        this.logger.log(`Detached mode: ${detached}`);
+        this.logger.log(`Consuming project root: ${consumingProjectPath}`);
+
+        // 3. Build docker compose args
+        const cmd = 'docker';
+        const args = ['compose', '-f', composeFile, 'up'];
+
+        if (detached) {
+            args.push('-d');
+        }
+
+        // Service names as defined in docker-compose.yml
+        args.push('mcp_redis', 'mcp_server', 'mcp_celery_worker');
+
+        const env: NodeJS.ProcessEnv = {
+            ...process.env,
+            MCP_API_KEY: apiKey,
+            HOST_SOLIDX_CONSUMING_PROJECT_ROOT: consumingProjectPath,
+            DATABASE_URL: databaseUrl,
+        };
+
+        this.logger.log(`Running: ${cmd} ${args.join(' ')}`);
+        // const envLog = Object.entries(env)
+        //     .map(([key, value]) => `${key}=${value ?? ''}`)
+        //     .join('\n');
+        // this.logger.log(`Using env overrides:\n${envLog}`);
+
+        await this.runDockerCommand(cmd, args, repoPath, env);
+
+        this.logger.log(
+            detached
+                ? 'MCP containers started in detached mode.'
+                : 'MCP containers started in foreground.'
+        );
+    }
+
+    // ---------------------------------------------------------------
+    // STOP
+    // ---------------------------------------------------------------
+    private async stopContainers(options?: McpCommandOptions): Promise<void> {
+        const repoPath = options?.repoPath ? this.resolvePath(options.repoPath) : process.cwd();
+        const composeFile = path.join(repoPath, 'docker-compose.yml');
+
+        if (!fs.existsSync(composeFile)) {
+            this.logger.error(`docker-compose.yml not found at ${composeFile}`);
+            return;
+        }
+
+        this.logger.log(`Mode: stop`);
+        this.logger.log(`Using repo path: ${repoPath}`);
+
+        const cmd = 'docker';
+        const args = ['compose', '-f', composeFile, 'down'];
+
+        this.logger.log(`Running: ${cmd} ${args.join(' ')}`);
+
+        await this.runDockerCommand(cmd, args, repoPath, process.env);
+
+        this.logger.log('MCP containers stopped (docker compose down).');
+    }
+
+    // ---------------------------------------------------------------
+    // Helpers
+    // ---------------------------------------------------------------
+    private resolvePath(inputPath: string): string {
+        if (inputPath.startsWith('~')) {
+            return path.join(process.env.HOME!, inputPath.slice(1));
+        }
+        return path.resolve(inputPath);
+    }
+
+    private runDockerCommand(
+        cmd: string,
+        args: string[],
+        cwd: string,
+        env: NodeJS.ProcessEnv,
+    ): Promise<void> {
+        return new Promise((resolve, reject) => {
+            const child = spawn(cmd, args, {
+                cwd,
+                env,
+                stdio: 'inherit',
+            });
+
+            child.on('error', (err) => {
+                this.logger.error(`Docker error: ${err.message}`);
+                reject(err);
+            });
+
+            child.on('close', (code) => {
+                if (code === 0) resolve();
+                else reject(new Error(`Docker exited with code ${code}`));
+            });
+        });
+    }
+
+    // Flags
+
+    @Option({
+        flags: '-d, --detached [boolean]',
+        description: 'Run containers in detached mode (only for start, default: false)',
+        required: false,
+    })
+    parseDetached(val: string): boolean {
+        if (val === undefined) return false;
+        return val === 'true' || val === '1';
+    }
+
+    @Option({
+        flags: '-p, --repo-path [path]',
+        description: 'Path to the SolidX MCP Server repo containing docker-compose.yml',
+        required: false,
+    })
+    parseRepoPath(val: string): string {
+        return val;
+    }
+}

package/src/commands/refresh-model.command.ts

@@ -1,12 +1,14 @@
-import { Logger } from '@nestjs/common';
+import { BadRequestException, Logger } from '@nestjs/common';
 import { Command, CommandRunner, Option } from 'nest-commander';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { CommandError } from './helper';
 
 interface CommandOptions {
-  name: string;
-  id: number;
-  dryRun: boolean;
+  name?: string;
+  id?: number;
+  fieldIds?: number[];
+  fieldNames?: string[];
+  dryRun?: boolean;
 }
 
 @Command({
@@ -32,10 +34,13 @@ export class RefreshModelCommand extends CommandRunner {
       modelId: options.id,
       modelUserKey: options.name,
       dryRun: options.dryRun,
+      fieldIdsForRefresh: options.fieldIds,
+      fieldNamesForRefresh: options.fieldNames,
     };
     await this.modelMetadataService.handleGenerateCode(codeGenerationOptions);
   }
 
+  // Accept the model ID as an argument
   @Option({
     flags: '-i, --id [model ID]',
     description: 'Model ID from the ss_model_metadata table',
@@ -53,6 +58,7 @@ export class RefreshModelCommand extends CommandRunner {
     return val;
   }
 
+  // Accept dry run as an argument
   @Option({
     flags: '-d, --dryRun [dry run]',
     description: 'Dry run the command',
@@ -62,8 +68,34 @@ export class RefreshModelCommand extends CommandRunner {
     return (val === 'false') ? false : true;
   }
 
+  // Accept field IDs as an argument
+  @Option({
+    flags: '-fids, --fieldIds [Array of field IDs]',
+    description: 'Json array of Field IDs from the ss_field_metadata table',
+  })
+  parseFieldIds(val: string): number[] {
+    //Check if the value is a json array
+    if (!val.startsWith('[') || !val.endsWith(']')) {
+      throw new BadRequestException('Field IDs should be a json array');
+    }
+    return JSON.parse(val).map((id: string) => parseInt(id));
+  }
+
+  // Accept field Names as an argument
+  @Option({
+    flags: '-fnames, --fieldNames [Array of field Names]',
+    description: 'Json array of Field Names from the ss_field_metadata table',
+  })
+  parseFieldNames(val: string): string[] {
+    //Check if the value is a json array
+    if (!val.startsWith('[') || !val.endsWith(']')) {
+      throw new BadRequestException('Field Names should be a json array');
+    }
+    return JSON.parse(val).map((name: string) => name.toString());
+  }
+
   // Validate the options passed
-  validate(options: CommandOptions): CommandError[] {
+  private validate(options: CommandOptions): CommandError[] {
     if (!options.id && !options.name) {
       return [new CommandError('Model ID or Model Name is required')];
     }

package/src/commands/remove-fields.command.ts

@@ -11,7 +11,7 @@ interface CommandOptions {
 
 @Command({
   name: 'remove-fields',
-  description: 'Adds fields to a model',
+  description: 'Removes fields from a model',
 })
 export class RemoveFieldsCommand extends CommandRunner {
   constructor(

package/src/commands/seed.command.ts

@@ -3,7 +3,7 @@ import { Command, CommandRunner, Option } from 'nest-commander';
 import { SolidRegistry } from 'src/helpers/solid-registry';
 
 interface SeedCommandOptions {
-  // module?: string;
+  conf?: string;
   seeder?: string;
 }
 
@@ -16,6 +16,25 @@ export class SeedCommand extends CommandRunner {
   }
 
   async run(passedParam: string[], options?: SeedCommandOptions): Promise<void> {
+    // TODO: check if options.conf is non empty and a valid json string only is -c flag is passed.
+    // TODO: convert to json object JSON.parse
+    let parsedConf: any = null;
+
+    // Parse conf only if provided
+    if (options?.conf !== undefined) {
+      try {
+        parsedConf = JSON.parse(options.conf);
+        this.logger.log(`Parsed conf: ${JSON.stringify(parsedConf, null, 2)}`);
+      } catch (err) {
+        this.logger.error('Failed to parse --conf. Please provide valid JSON.');
+        return;
+      }
+    } else {
+      this.logger.log('No --conf flag provided. Running with default seeder behavior.');
+    }
+
+
+
     const seeder = this.solidRegistry
       .getSeeders()
       .filter((seeder) => seeder.name === options.seeder)
@@ -26,22 +45,22 @@ export class SeedCommand extends CommandRunner {
       return;
     }
     this.logger.log(`Running the seed() method for seeder :${seeder.constructor.name}`);
-    await seeder.seed();
+    await seeder.seed(parsedConf);
   }
 
-  // @Option({
-  //   flags: '-m, --module [module name]',
-  //   description: 'Name of the module, all seeders inside this module will be run automatically.',
-  //   required: true
-  // })
-  // /**
-  //  * TODO
-  //  * This parameter will be useful, to support seeders with the same name in different modules
-  //  * Currently the seeder service won't support seeder with same classname within a module
-  //  **/
-  // parseModule(val: string): string {
-  //   return val;
-  // }
+  @Option({
+    flags: '-c, --conf [configuration json]',
+    description: 'A configuration json, pass a valid json string.',
+    required: false
+  })
+  /**
+   * TODO
+   * This parameter will be useful, to support seeders with the same name in different modules
+   * Currently the seeder service won't support seeder with same classname within a module
+   **/
+  parseConf(val: string): string {
+    return val;
+  }
 
   @Option({
     flags: '-s, --seeder [seeder name]',

package/src/controllers/authentication.controller.ts

@@ -15,7 +15,7 @@ import { AuthenticationService } from '../services/authentication.service';
 
 // @Auth(AuthType.None)
 @Controller('iam')
-@ApiTags("Iam")
+@ApiTags("Solid Core")
 // @UseGuards(ThrottlerGuard)
 // @SkipThrottle({login: true, short: true, burst: true, sustained: true}) // disable all sets by default for this controller
 export class AuthenticationController {

package/src/controllers/email-template.controller.ts

@@ -10,7 +10,7 @@ import Mailgen = require('mailgen');
 
 
 @Controller('email-template')
-@ApiTags("Common")
+@ApiTags("Solid Core")
 export class EmailTemplateController {
   constructor(private readonly service: EmailTemplateService) { }
 

package/src/controllers/field-metadata.controller.ts

@@ -6,9 +6,10 @@ import { FieldMetadataService } from '../services/field-metadata.service';
 import { Public } from 'src/decorators/public.decorator';
 import { BasicFilterDto } from '../dtos/basic-filters.dto';
 import { SelectionDynamicQueryDto } from '../dtos/selection-dynamic-query.dto';
+import { ResolveS3UrlDto } from 'src/dtos/resolve-s3-url.dto';
 
 @Controller('field-metadata')
-@ApiTags("App Builder")
+@ApiTags("Solid Core")
 export class FieldMetadataController {
 
     constructor(
@@ -67,6 +68,11 @@ export class FieldMetadataController {
         return this.fieldMetadataService.delete(id);
     }
 
+    @ApiBearerAuth("jwt")
+    @Post('/resolve-s3-url')
+    resolveS3Url(@Body() resolveS3UrlDto: ResolveS3UrlDto) {
+        return this.fieldMetadataService.resolveS3Url(resolveS3UrlDto);
 
+    }
 
 }

package/src/controllers/media-storage-provider-metadata.controller.ts

@@ -8,7 +8,7 @@ import { UpdateMediaStorageProviderMetadataDto } from '../dtos/update-media-stor
 import { AnyFilesInterceptor } from '@nestjs/platform-express';
 
 @Controller('media-storage-provider-metadata')
-@ApiTags("App Builder")
+@ApiTags("Solid Core")
 export class MediaStorageProviderMetadataController {
     private logger = new Logger(MediaStorageProviderMetadataController.name);
 

package/src/controllers/model-metadata.controller.ts

@@ -7,7 +7,7 @@ import { UpdateModelMetaDataDto } from '../dtos/update-model-metadata.dto';
 import { ModelMetadataService } from '../services/model-metadata.service';
 
 @Controller('model-metadata')
-@ApiTags("App Builder")
+@ApiTags("Solid Core")
 // @UseGuards(ThrottlerGuard)
 // @SkipThrottle({ short: true, login: true, burst: true, sustained: true }) //Skip all
 export class ModelMetadataController {

package/src/controllers/module-metadata.controller.ts

@@ -19,7 +19,7 @@ import { ModuleMetadataService } from '../services/module-metadata.service';
 import { AnyFilesInterceptor } from '@nestjs/platform-express';
 
 @Controller('module-metadata')
-@ApiTags("App Builder")
+@ApiTags("Solid Core")
 export class ModuleMetadataController {
   constructor(private readonly moduleMetadataService: ModuleMetadataService) { }
 

package/src/controllers/otp-authentication.controller.ts

@@ -13,7 +13,7 @@ import { AuthenticationService } from '../services/authentication.service';
 
 @Auth(AuthType.None)
 @Controller('iam/otp')
-@ApiTags("Iam")
+@ApiTags("Solid Core")
 // @UseGuards(ThrottlerGuard)
 // @SkipThrottle({ login: false, short: true, burst: true, sustained: true }) //Enable the login throttle only
 export class OTPAuthenticationController {

package/src/controllers/service.controller.ts

@@ -14,7 +14,7 @@ export interface PostProcessCodeGenConfig {
     runSolidIngestion?: boolean; // If true, run solid ingestion command
 }
 @Controller('')
-@ApiTags("Common")
+@ApiTags("Solid Core")
 // @UseGuards(ThrottlerGuard)
 // @SkipThrottle({ short: true, login: true, burst: true, sustained: true }) // Skip all
 export class ServiceController {

package/src/controllers/sms-template.controller.ts

@@ -7,7 +7,7 @@ import { SmsTemplateService } from '../services/sms-template.service';
 
 
 @Controller('sms-template')
-@ApiTags("Common")
+@ApiTags("Solid Core")
 // @UseGuards(ThrottlerGuard)
 // @SkipThrottle({ short: false, login: true, burst: true, sustained: true }) //Enable the short throttle only
 export class SmsTemplateController {

package/src/controllers/test-queue.controller.ts

@@ -8,7 +8,7 @@ import { PublisherFactory } from 'src/services/queues/publisher-factory.service'
 
 @Auth(AuthType.None)
 @Controller('queues')
-@ApiTags("Queues")
+@ApiTags("Solid Core")
 export class TestQueueController {
 
     constructor(

package/src/controllers/test.controller.ts

@@ -11,7 +11,7 @@ export class SeedData {
 }
 
 @Controller('test')
-@ApiTags("App Builder")
+@ApiTags("Solid Core")
 export class TestController {
   private readonly logger = new Logger(TestController.name);
   constructor(

package/src/dtos/create-ai-interaction.dto.ts

@@ -64,19 +64,26 @@ export class CreateAiInteractionDto {
     @IsBoolean()
     @ApiProperty()
     isAutoApply: boolean = false;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    inputTokens: number;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    outputTokens: number;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    totalTokens: number;
 
 @IsOptional()
-@IsInt()
-@ApiProperty()
-inputTokens: number;
-
-@IsOptional()
-@IsInt()
+@IsString()
 @ApiProperty()
-outputTokens: number;
+originalMessage: string;
 
 @IsOptional()
-@IsInt()
+@IsBoolean()
 @ApiProperty()
-totalTokens: number;
+isEdited: boolean = false;
 }

package/src/dtos/create-field-metadata.dto.ts

@@ -5,6 +5,7 @@ import {
   IsArray,
   IsBoolean,
   IsEnum,
+  IsIn,
   IsInt,
   IsOptional,
   IsString,
@@ -62,10 +63,6 @@ export enum SolidFieldType {
   uuid = 'uuid'
 }
 
-export enum OrmType {
-  MySQLType,
-}
-
 export enum MySQLType { //FIXME Currently this type is being used in the definition, Need to use OrmType instead
   // Numeric types
   int = 'int',
@@ -118,8 +115,35 @@ export enum PSQLType { //FIXME Currently this type is being used in the definiti
   // Other types
   json = 'json',
   jsonb = 'jsonb',
+  simplejson = 'simple-json'
 }
 
+export enum MSSQLType {
+  int = "int",
+  bigint = "bigint",
+  decimal = "decimal",
+  numeric = "numeric",
+  varchar = "varchar",
+  nvarchar = "nvarchar",
+  simplejson = "simple-json",
+  text = "text",
+  bit = "bit",
+  date = "date",
+  datetime = "datetime",
+  datetime2 = "datetime2",
+  time = "time",
+  uniqueidentifier = "uniqueidentifier"
+}
+
+export const ALL_ORM_TYPES = [
+  ...Object.values(PSQLType),
+  ...Object.values(MSSQLType),
+  ...Object.values(MySQLType),
+] as const;
+
+export type OrmType = typeof ALL_ORM_TYPES[number];
+
+// export type OrmType = PSQLType | MySQLType | MSSQLType;
 
 export enum EncryptionType {
   aes128 = 'aes-128',
@@ -172,12 +196,12 @@ export enum ComputedFieldValueType {
 }
 
 export enum ComputedFieldTriggerOperation {
-    beforeInsert = "before-insert",
-    afterInsert = "after-insert",
-    beforeUpdate = "before-update",
-    afterUpdate = "after-update",
-    beforeRemove = "before-delete",
-    afterRemove = "after-delete",
+  beforeInsert = "before-insert",
+  afterInsert = "after-insert",
+  beforeUpdate = "before-update",
+  afterUpdate = "after-update",
+  beforeRemove = "before-delete",
+  afterRemove = "after-delete",
 }
 
 export class ComputedFieldTriggerConfig {
@@ -217,9 +241,9 @@ export class CreateFieldMetadataDto {
 
   //For all types of fields
   @ApiProperty({ description: 'Field can have orm types specific to your database', })
-  @IsEnum(PSQLType)
+  @IsIn(ALL_ORM_TYPES)
   @IsOptional()
-  readonly ormType: PSQLType;
+  readonly ormType: OrmType;
 
   @ApiProperty({ description: 'Length of the field. Only for type=text' })
   @IsInt()
@@ -426,6 +450,7 @@ export class CreateFieldMetadataDto {
   @IsOptional()
   relationJoinTableName: string
 
+  @ApiProperty({ description: 'Enable Audit Tracking for this field', })
   @IsOptional()
   @IsBoolean()
   enableAuditTracking?: boolean;
@@ -434,4 +459,9 @@ export class CreateFieldMetadataDto {
   @ApiProperty({ description: 'Is MultiSelect Field', })
   @IsBoolean()
   isMultiSelect: boolean;
+
+  @IsOptional()
+  @ApiProperty({ description: 'Is Primary Key Field', })
+  @IsBoolean()
+  isPrimaryKey?: boolean;
 }

package/src/dtos/create-import-transaction.dto.ts

@@ -10,10 +10,6 @@ export class CreateImportTransactionDto {
     @ApiProperty()
     status: string = "draft";
     @IsOptional()
-    @IsString()
-    @ApiProperty()
-    importTransactionId: string;
-    @IsOptional()
     @IsJSON()
     @ApiProperty()
     mapping: any;

package/src/dtos/create-model-metadata.dto.ts

@@ -112,4 +112,14 @@ export class CreateModelMetadataDto {
     @IsString()
     @IsOptional()
     parentModelUserKey: string;
+
+    @ApiProperty({ description: 'Is legacy table' })
+    @IsBoolean()
+    @IsOptional()
+    isLegacyTable?: boolean;
+
+    @ApiProperty({ description: 'Is legacy table with id' })
+    @IsBoolean()
+    @IsOptional()
+    isLegacyTableWithId?: boolean;
 }