@solidstarters/solid-core 1.2.183 → 1.2.184

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.183",
+  "version": "1.2.184",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/jobs/database/trigger-mcp-client-subscriber-database.service.ts

@@ -1,15 +1,17 @@
 import { Injectable, Logger } from '@nestjs/common';
+import { ModelMetadataService } from 'src';
+import { SolidRegistry } from 'src/helpers/solid-registry';
 import { QueueMessage } from 'src/interfaces/mq';
-import { MqMessageService } from '../../services/mq-message.service';
-import { MqMessageQueueService } from '../../services/mq-message-queue.service';
-import { McpResponse, QueuesModuleOptions, TriggerMcpClientOptions } from "../../interfaces";
-import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
-import triggerMcpClientQueueOptions from "./trigger-mcp-client-queue-options";
+import { DashboardRepository } from 'src/repository/dashboard.repository';
 import { AiInteractionService } from 'src/services/ai-interaction.service';
-import { PollerService } from 'src/services/poller.service';
-import { SolidRegistry } from 'src/helpers/solid-registry';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { ModelMetadataService } from 'src';
+import { PollerService } from 'src/services/poller.service';
+import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
+import { Not } from 'typeorm';
+import { McpResponse, QueuesModuleOptions, TriggerMcpClientOptions } from "../../interfaces";
+import { MqMessageQueueService } from '../../services/mq-message-queue.service';
+import { MqMessageService } from '../../services/mq-message.service';
+import triggerMcpClientQueueOptions from "./trigger-mcp-client-queue-options";
 
 @Injectable()
 export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<TriggerMcpClientOptions> {
@@ -23,6 +25,8 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
         readonly moduleMetadataService: ModuleMetadataService,
         readonly modelMetadataService: ModelMetadataService,
         private readonly solidRegistry: SolidRegistry,
+        // private readonly dashboardService: DashboardService
+        private readonly dashboardRepository: DashboardRepository
 
     ) {
         super(mqMessageService, mqMessageQueueService, poller);
@@ -122,6 +126,22 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
             populate: ['module']
         });
 
+        // Get the list of dashboards
+        //TODO: Ideally we should fetch dashboard like below, but used below approach to avoid below CLS issues for now.
+        // Cannot set the key "filter". No CLS context available, please make sure that a ClsMiddleware/Guard/Interceptor has set up the context, or wrap any calls that depend on CLS with "ClsService#run"
+        // const { records: existingDashboards } = await this.dashboardService.find({
+        //     fields
+        // })
+        const existingDashboards = await this.dashboardRepository.find(
+            {
+                where: {
+                    module: {
+                        name: Not('solid-core')
+                    }
+                },
+            }
+        );
+
         // Build markdown sections using template interpolation
         const modulesSection = (existingModules ?? [])
             .map(m => [
@@ -140,6 +160,14 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
             ].join('\n'))
             .join('\n\n');
 
+        const dashboardsSection = (existingDashboards ?? [])
+            .map(d => [
+                `### ${d.displayName}`,
+                `- name: ${d.name}`,
+                `- description: ${d.description ?? ""}`,
+            ].join('\n'))
+            .join('\n\n');    
+
         const computationProvidersSection = (existingComputationProviders ?? [])
             .map(m => [
                 `### ${m.instance.name()}`,
@@ -148,6 +176,7 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
             ].join('\n'))
             .join('\n\n');
 
+
         const finalPrompt = `
 # User Prompt: 
 ${prompt}
@@ -171,6 +200,11 @@ Use the below list of modules to infer which module the user is referring to.
 
 ${modelsSection}
 
+## LIST OF EXISTING DASHBOARDS
+Use the below list of dashboards to infer which dashboard the user is referring to.
+
+${dashboardsSection}
+
 ## LIST OF EXISTING COMPUTED FIELD PROVIDERS
 Use the below list of computed field providers to infer which provider the user is referring to.
 

package/src/services/chatter-message.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { EntityManager, Repository, EntityMetadata } from 'typeorm';
+import { EntityManager, Repository, EntityMetadata, Brackets } from 'typeorm';
 
 import { CRUDService } from 'src/services/crud.service';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
@@ -514,7 +514,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         entityName: string,
         query: any
     ) {
-        const { limit = 25, offset = 0, sort, populate = [], populateMedia = [] } = query;
+        const { limit = 25, offset = 0, populate = [], populateMedia = [], filters } = query;
 
         const model = await this.modelMetadataRepo.findOne({
             where: {
@@ -575,7 +575,9 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             }
         }
 
-        qb.where(orConditions.join(' OR '), parameters);
+        qb.where(new Brackets(qb => {
+            qb.where(orConditions.join(' OR '), parameters);
+        }));
 
         const relations = ['chatterMessageDetails', 'user'];
         if (populate && populate.length > 0) {
@@ -587,6 +589,12 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             qb.leftJoinAndSelect(`entity.${relation}`, relation);
         });
 
+        if (filters) {
+            qb.andWhere(new Brackets(whereQb => {
+                this.crudHelperService.applyFilters(whereQb, filters, 'entity', qb);
+            }));
+        }
+
         qb.orderBy('entity.createdAt', 'DESC');
 
         qb.skip(offset).take(limit);

package/src/services/genai/mcp-handlers/solid-add-question-to-dashboard-mcp-handler.service.ts

@@ -0,0 +1,43 @@
+import { Injectable } from "@nestjs/common";
+import { plainToInstance } from "class-transformer";
+import { CreateDashboardQuestionDto } from "src/dtos/create-dashboard-question.dto";
+import { AiInteraction } from "src/entities/ai-interaction.entity";
+import { IMcpToolResponseHandler } from "../../../interfaces";
+import { DashboardQuestionService } from "../../dashboard-question.service";
+
+@Injectable()
+export class SolidAddQuestionToDashboardMcpHandler implements IMcpToolResponseHandler {
+
+    constructor(
+        private readonly dashboardQuestionService: DashboardQuestionService,
+    ) {
+    }
+
+    async apply(aiInteraction: AiInteraction) {
+        const escapedMessage = aiInteraction.message.replace(/\\'/g, "'");
+        const aiResponseMessage = JSON.parse(escapedMessage);
+
+        const {data} = aiResponseMessage;
+        const { dashboardUserKey, schema} = data;
+
+        //FIXME: Replace \' with ' in the response, since the AI response seems to contain \' which is invalid JSON.
+        // This is a workaround for now, until we find a better solution.
+        // const aiResponseMessageReplaced = aiResponseMessage['message'].replace(/\\'/g, "'");
+        // const dashboardUserKey = aiResponseMessageReplaced['dashboardUserKey'];
+        // if (!dashboardUserKey) {
+        //     throw new Error("Dashboard User Key is required to create a Dashboard Question.");
+        // }
+        const dashboardQuestionDto = plainToInstance(CreateDashboardQuestionDto, schema);
+        dashboardQuestionDto['questionSqlDatasetConfigsCommand'] = "update";
+        dashboardQuestionDto['dashboardUserKey'] = dashboardUserKey;
+
+        const dashboardQuestion = await this.dashboardQuestionService.create(dashboardQuestionDto, []);
+
+        // TODO: decide on some shape to return hre...
+        return {
+            seedingRequired: false,
+            serverRebooting: false,
+        }
+    }
+
+}

package/src/services/genai/mcp-handlers/solid-add-variable-to-dashboard-mcp-handler.service.ts

@@ -0,0 +1,44 @@
+import { Injectable } from "@nestjs/common";
+import { plainToInstance } from "class-transformer";
+import { CreateDashboardVariableDto } from "src/dtos/create-dashboard-variable.dto";
+import { AiInteraction } from "src/entities/ai-interaction.entity";
+import { DashboardVariableService } from "src/services/dashboard-variable.service";
+import { IMcpToolResponseHandler } from "../../../interfaces";
+
+@Injectable()
+export class SolidAddVariableToDashboardMcpHandler implements IMcpToolResponseHandler {
+
+    constructor(
+        private readonly dashboardVariableService: DashboardVariableService,
+    ) {
+    }
+
+    async apply(aiInteraction: AiInteraction) {
+        const escapedMessage = aiInteraction.message.replace(/\\'/g, "'");
+        const aiResponseMessage = JSON.parse(escapedMessage);
+
+        const {data} = aiResponseMessage;
+        const { dashboardUserKey, schema} = data;
+
+        //FIXME: Replace \' with ' in the response, since the AI response seems to contain \' which is invalid JSON.
+        // This is a workaround for now, until we find a better solution.
+        // const aiResponseMessageReplaced = aiResponseMessage['message'].replace(/\\'/g, "'");
+        // const dashboardUserKey = aiResponseMessageReplaced['dashboardUserKey'];
+        // if (!dashboardUserKey) {
+        //     throw new Error("Dashboard User Key is required to create a Dashboard Question.");
+        // }
+        const dashboardVariableDto = plainToInstance(CreateDashboardVariableDto, schema);
+        dashboardVariableDto['selectionStaticValues'] = JSON.stringify(dashboardVariableDto['selectionStaticValues'] || []);
+        dashboardVariableDto['defaultValue'] = JSON.stringify(dashboardVariableDto['defaultValue'] || []);
+        dashboardVariableDto['dashboardUserKey'] = dashboardUserKey;
+
+        const dashboardVariable = await this.dashboardVariableService.create(dashboardVariableDto, []);
+
+        // TODO: decide on some shape to return hre...
+        return {
+            seedingRequired: false,
+            serverRebooting: false,
+        }
+    }
+
+}

package/src/services/genai/mcp-handlers/solid-create-dashboard-mcp-handler.service.ts

@@ -13,7 +13,7 @@ import { ModuleMetadataService } from "../../module-metadata.service";
 import { RoleMetadataService } from "../../role-metadata.service";
 
 @Injectable()
-export class SolidCreateDashboardMcpHandler implements IMcpToolResponseHandler {
+export class SolidCreateDashboardWithWidgetsMcpHandler implements IMcpToolResponseHandler {
 
     constructor(
         private readonly dashboardService: DashboardService,
@@ -28,8 +28,9 @@ export class SolidCreateDashboardMcpHandler implements IMcpToolResponseHandler {
     async apply(aiInteraction: AiInteraction) {
         const escapedMessage = aiInteraction.message.replace(/\\'/g, "'");
         const aiResponseMessage = JSON.parse(escapedMessage);
-
-        const { dashboardDto, dashboard } = await this.createDashboard(aiResponseMessage);
+        const { data } = aiResponseMessage;
+        const { schema } = data;
+        const { dashboardDto, dashboard } = await this.createDashboard(schema);
 
         const { moduleUserKey, actionMetadataEntity } = await this.createActionMetadataEntry(dashboardDto, dashboard);
 

package/src/solid-core.module.ts

@@ -288,12 +288,14 @@ import { SolidCreateModuleMcpHandler } from './services/genai/mcp-handlers/solid
 import { SolidCreateModelWithFieldsMcpHandler } from './services/genai/mcp-handlers/solid-create-model-with-fields-mcp-handler.service';
 import { SolidAddFieldsToModelMcpHandler } from './services/genai/mcp-handlers/solid-add-fields-to-model-mcp-handler.service';
 import { SolidUpdateLayoutMcpHandler } from './services/genai/mcp-handlers/solid-update-layout-mcp-handler.service';
-import { SolidCreateDashboardMcpHandler } from './services/genai/mcp-handlers/solid-create-dashboard-mcp-handler.service';
+import { SolidCreateDashboardWithWidgetsMcpHandler } from './services/genai/mcp-handlers/solid-create-dashboard-mcp-handler.service';
 import { SolidCreateDashboardQuestionMcpHandler } from './services/genai/mcp-handlers/solid-create-dashboard-question-mcp-handler.service';
 import { SolidCreateDashboardQuestionSqlDatasetConfigMcpHandler } from './services/genai/mcp-handlers/solid-create-dashboard-question-sql-dataset-config-mcp-handler.service';
 import { SolidCreateDashboardWidgetMcpHandler } from './services/genai/mcp-handlers/solid-create-dashboard-widget-mcp-handler.service';
 import { SolidCreateComputedProviderMcpHandler } from './services/genai/mcp-handlers/solid-create-computed-provider-mcp-handler.service';
 import { SolidTsMorphService } from './services/solid-ts-morph.service';
+import { SolidAddVariableToDashboardMcpHandler } from './services/genai/mcp-handlers/solid-add-variable-to-dashboard-mcp-handler.service';
+import { SolidAddQuestionToDashboardMcpHandler } from './services/genai/mcp-handlers/solid-add-question-to-dashboard-mcp-handler.service';
 
 
 @Global()
@@ -631,11 +633,13 @@ import { SolidTsMorphService } from './services/solid-ts-morph.service';
     SolidAddFieldsToModelMcpHandler,
     SolidUpdateLayoutMcpHandler,
 
-    SolidCreateDashboardMcpHandler,
+    SolidCreateDashboardWithWidgetsMcpHandler,
     SolidCreateDashboardQuestionMcpHandler,
     SolidCreateDashboardQuestionSqlDatasetConfigMcpHandler,
     SolidCreateDashboardWidgetMcpHandler,
     SolidCreateComputedProviderMcpHandler,
+    SolidAddVariableToDashboardMcpHandler,
+    SolidAddQuestionToDashboardMcpHandler,
     SolidTsMorphService,
 
     ViewMetadataRepository,