@solidxai/core 0.1.5-beta.2 → 0.1.5-beta.3

package/src/commands/info.command.ts

@@ -4,6 +4,7 @@ import { ISolidDatabaseModule } from 'src/interfaces';
 import { getDynamicModuleNames } from 'src/helpers/module.helper';
 import { SolidRegistry } from 'src/helpers/solid-registry';
 import { SettingService } from 'src/services/setting.service';
+import { InfoService } from 'src/services/info.service';
 
 interface InfoCommandOptions {
     detailed?: boolean;
@@ -16,6 +17,7 @@ export class InfoCommand extends CommandRunner {
     constructor(
         private readonly solidRegistry: SolidRegistry,
         private readonly settingService: SettingService,
+        private readonly infoService: InfoService,
     ) {
         super();
     }
@@ -25,6 +27,7 @@ export class InfoCommand extends CommandRunner {
         const dataSources = this.getDataSources();
 
         const output: Record<string, any> = {
+            packages: this.infoService.getPackageVersions(),
             modules: {
                 count: enabledModules.length,
                 names: enabledModules,

package/src/controllers/info.controller.ts

@@ -0,0 +1,15 @@
+import { Controller, Get } from '@nestjs/common';
+import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
+import { InfoService } from '../services/info.service';
+
+@ApiTags('Solid Core')
+@ApiBearerAuth('jwt')
+@Controller('info')
+export class InfoController {
+    constructor(private readonly infoService: InfoService) {}
+
+    @Get('/versions')
+    getVersions() {
+        return this.infoService.getPackageVersions();
+    }
+}

package/src/entities/ai-interaction.entity.ts

@@ -5,38 +5,51 @@ import { User } from 'src/entities/user.entity'
 @Entity("ss_ai_interactions")
 export class AiInteraction extends CommonEntity {
     @Index()
-    @ManyToOne(() => User, { nullable: false })
+    @ManyToOne(() => User, { nullable: true })
     @JoinColumn()
     user: User;
+
     @Index()
     @Column({ type: "varchar" })
     threadId: string;
+
     @Column({ type: "varchar" })
     role: string;
+
     @Column({ type: "text" })
     message: string;
+
     @Column({ type: "varchar", nullable: true })
     contentType: string;
+
     @Index()
     @Column({ type: "varchar", nullable: true })
     status: string;
+
     @Column({ type: "text", nullable: true })
     errorMessage: string;
+
     @Column({ type: "varchar", nullable: true })
     modelUsed: string;
+
     @Column({ type: "integer", nullable: true })
     responseTimeMs: number;
+
     @Column({ type: "simple-json", nullable: true })
     metadata: any;
+
     @Column({ nullable: true, default: false })
     isApplied: boolean = false;
+
     @Index()
     @ManyToOne(() => AiInteraction, { nullable: true })
     @JoinColumn()
     parentInteraction: AiInteraction;
+
     @Index({ unique: true })
     @Column({ type: "varchar" })
     externalId: string;
+
     @Column({ nullable: true, default: false })
     isAutoApply: boolean = false;
 
@@ -48,8 +61,10 @@ export class AiInteraction extends CommonEntity {
 
     @Column({ type: "integer", nullable: true })
     totalTokens: number;
+
     @Column({ type: "text", nullable: true })
     originalMessage: string;
+
     @Column({ nullable: true, default: false })
     isEdited: boolean = false;
-}
+}

package/src/entities/dashboard-question-sql-dataset-config.entity.ts

@@ -7,22 +7,30 @@ export class DashboardQuestionSqlDatasetConfig extends CommonEntity {
     @Index({ unique: true })
     @Column({ type: "varchar" })
     datasetName: string;
+
     @Column({ type: "varchar" })
     datasetDisplayName: string;
+
     @Column({ type: "text", nullable: true })
     description: string;
+
     @Column({ type: "text" })
     sql: string;
+
     @Column({ type: "varchar" })
     labelColumnName: string;
+
     @Column({ type: "varchar" })
     valueColumnName: string;
+
     @ManyToOne(() => DashboardQuestion, { nullable: false })
     @JoinColumn()
     question: DashboardQuestion;
+
     @Column({ type: "text", nullable: true })
     options: any;
+
     @Index({ unique: true })
     @Column({ type: "varchar", nullable: false })
     externalId: string;
-}
+}

package/src/entities/dashboard-question.entity.ts

@@ -8,27 +8,37 @@ export class DashboardQuestion extends CommonEntity {
     @Index({ unique: true })
     @Column({ type: "varchar" })
     name: string;
+
     @Index()
     @Column({})
     sourceType: string;
+
     @Index()
     @Column({})
     visualisedAs: string;
+
     @Column({ type: "varchar", nullable: true })
     providerName: string;
+
     @ManyToOne(() => Dashboard, { nullable: true })
     @JoinColumn()
     dashboard: Dashboard;
+
     @OneToMany(() => DashboardQuestionSqlDatasetConfig, dashboardQuestionSqlDatasetConfig => dashboardQuestionSqlDatasetConfig.question, { cascade: true })
     questionSqlDatasetConfigs: DashboardQuestionSqlDatasetConfig[];
+
     @Column({ type: "simple-json", nullable: true })
     chartOptions: any;
+
     @Column({ type: "text", nullable: true })
     labelSql: string;
+
     @Column({ type: "text", nullable: true })
     kpiSql: string;
+
     @Column({ type: "integer", nullable: true })
     sequenceNumber: number;
+
     @Index({ unique: true })
     @Column({ type: "varchar", nullable: false })
     externalId: string;

package/src/entities/dashboard-variable.entity.ts

@@ -7,24 +7,33 @@ export class DashboardVariable extends CommonEntity {
     @Index({ unique: true })
     @Column({ type: "varchar" })
     variableName: string;
+
     @Index()
     @Column({ type: "varchar" })
     variableType: string;
+
     @Column({ type: "simple-json", nullable: true })
     selectionStaticValues: any;
+
     @Column({ nullable: true })
     selectionDynamicSourceType: string;
+
     @Column({ type: "text", nullable: true })
     selectionDynamicSQL: string;
+
     @Column({ type: "varchar", nullable: true })
     selectionDynamicProviderName: string;
+
     @Column({ nullable: true, default: true })
     isMultiSelect: boolean = true;
+
     @ManyToOne(() => Dashboard, { nullable: true })
     @JoinColumn()
     dashboard: Dashboard;
+
     @Column({ type: "text", nullable: true })
     defaultValue: string;
+
     @Column({ type: "varchar", nullable: true })
     defaultOperator: string;
 }

package/src/index.ts

@@ -264,6 +264,8 @@ export * from './services/user.service'
 export * from './services/view-metadata.service'
 export * from './services/whatsapp/Msg91WhatsappService' //rename
 export * from './services/setting.service'
+export * from './services/info.service'
+export * from './controllers/info.controller'
 export * from './services/settings/default-settings-provider.service'
 export * from './services/security-rule.service'
 export * from './services/request-context.service'

package/src/interfaces.ts

@@ -262,6 +262,7 @@ export interface QueuesModuleOptions {
   name: string;
   type: BrokerType;
   queueName: string;
+  prefetch?: number;
 }
 
 export type MediaWithFullUrl = Media & {

package/src/seeders/seed-data/solid-core-metadata.json

@@ -4932,7 +4932,7 @@
             "name": "user",
             "displayName": "User",
             "type": "relation",
-            "required": true,
+            "required": false,
             "unique": false,
             "index": true,
             "private": false,

package/src/services/info.service.ts

@@ -0,0 +1,60 @@
+import { Injectable, Logger } from '@nestjs/common';
+import * as fs from 'fs';
+import * as path from 'path';
+
+interface PackageVersionInfo {
+    repo: 'local' | 'npm';
+    version: string;
+}
+
+export interface SolidVersionsInfo {
+    'solid-core': PackageVersionInfo;
+    'solid-core-ui': PackageVersionInfo;
+    'solid-code-builder': PackageVersionInfo;
+}
+
+@Injectable()
+export class InfoService {
+    private readonly logger = new Logger(InfoService.name);
+
+    getPackageVersions(): SolidVersionsInfo {
+        return {
+            'solid-core': this.getPackageInfo('@solidxai/core'),
+            'solid-core-ui': this.getPackageInfo('@solidxai/core-ui'),
+            'solid-code-builder': this.getPackageInfo('@solidxai/code-builder'),
+        };
+    }
+
+    private getPackageInfo(packageName: string): PackageVersionInfo {
+        const result = this.resolvePackageJson(packageName);
+        if (result) return result;
+
+        const siblingUiPath = path.resolve(process.cwd(), '..', 'solid-ui', 'node_modules', packageName, 'package.json');
+        const siblingResult = this.readPackageJson(siblingUiPath);
+        if (siblingResult) return siblingResult;
+
+        this.logger.warn(`Could not resolve package: ${packageName}`);
+        return { repo: 'npm', version: 'not installed' };
+    }
+
+    private resolvePackageJson(packageName: string): PackageVersionInfo | null {
+        try {
+            const pkgJsonPath = require.resolve(`${packageName}/package.json`);
+            return this.readPackageJson(pkgJsonPath);
+        } catch {
+            return null;
+        }
+    }
+
+    private readPackageJson(pkgJsonPath: string): PackageVersionInfo | null {
+        try {
+            if (!fs.existsSync(pkgJsonPath)) return null;
+            const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8'));
+            const version = pkgJson.version ? `v${pkgJson.version}` : 'unknown';
+            const repo = pkgJsonPath.includes(path.sep + 'node_modules' + path.sep) ? 'npm' : 'local';
+            return { repo, version };
+        } catch {
+            return null;
+        }
+    }
+}

package/src/services/queues/rabbitmq-subscriber.service.ts

@@ -97,6 +97,12 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         await this.cleanup();
         this.logger.log(`RabbitMqSubscriber in connectAndConsume for queue: ${queueName} and url: ${this.url}`);
 
+        const options = this.options();
+        const prefetch = options.prefetch ?? 1;
+        if (prefetch < 1) {
+            throw new Error(`RabbitMqSubscriber prefetch must be >= 1 for queue ${queueName}`);
+        }
+
         let connection: amqp.Connection;
         try {
             connection = await this.establishConnection();
@@ -133,7 +139,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         });
 
         // Process one message at a time per consumer to avoid parallel work on the same subscriber instance.
-        await channel.prefetch(1);
+        await channel.prefetch(prefetch);
 
         // Use a direct exchange with a stable routing key so retry DLX can route back to the main queue.
         const exchangeName = `${queueName}.exchange`;

package/src/solid-core.module.ts

@@ -145,6 +145,8 @@ import { SavedFiltersController } from './controllers/saved-filters.controller';
 import { ScheduledJobController } from './controllers/scheduled-job.controller';
 import { SecurityRuleController } from './controllers/security-rule.controller';
 import { SettingController } from './controllers/setting.controller';
+import { InfoController } from './controllers/info.controller';
+import { InfoService } from './services/info.service';
 import { UserActivityHistoryController } from './controllers/user-activity-history.controller';
 import { UserViewMetadataController } from './controllers/user-view-metadata.controller';
 import { UserController } from './controllers/user.controller';
@@ -436,6 +438,7 @@ import { ListOfRolesSelectionProvider } from './services/selection-providers/lis
     SecurityRuleController,
     ServiceController,
     SettingController,
+    InfoController,
     SmsTemplateController,
     TestController,
     TestQueueController,
@@ -475,6 +478,7 @@ import { ListOfRolesSelectionProvider } from './services/selection-providers/lis
     RefreshModelCommand,
     RefreshModuleCommand,
     InfoCommand,
+    InfoService,
     SolidIntrospectService,
     DiscoveryService,
     R2RHelperService,