@solidstarters/solid-core 1.2.135 → 1.2.136

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

@@ -4337,7 +4337,7 @@
                     },
                     {
                         "name": "questions",
-                        "displayName": "Questions",
+                        "displayName": "Dashboard Questions",
                         "type": "relation",
                         "required": false,
                         "unique": false,
@@ -4345,7 +4345,7 @@
                         "relationType": "one-to-many",
                         "relationCoModelFieldName": "dashboard",
                         "relationCreateInverse": true,
-                        "relationCoModelSingularName": "question",
+                        "relationCoModelSingularName": "dashboardQuestion",
                         "relationModelModuleName": "solid-core",
                         "isSystem": true
                     },
@@ -4547,13 +4547,13 @@
                 ]
             },
             {
-                "singularName": "question",
-                "pluralName": "questions",
-                "displayName": "Question",
-                "description": "This is used to maintain questions for dashboards",
+                "singularName": "dashboardQuestion",
+                "pluralName": "dashboardQuestions",
+                "displayName": "Dashboard Question",
+                "description": "This is used to maintain dashboard questions for dashboards",
                 "dataSource": "default",
                 "dataSourceType": "postgres",
-                "tableName": "ss_question",
+                "tableName": "ss_dashboard_question",
                 "userKeyFieldUserKey": "name",
                 "fields": [
                     {
@@ -4604,6 +4604,18 @@
                             "prime-datatable:Prime - Datatable"
                         ]
                     },
+                    {
+                        "name": "sequenceNumber",
+                        "displayName": "Sequence Number",
+                        "type": "int",
+                        "ormType": "integer",
+                        "required": false,
+                        "unique": false,
+                        "index": false,
+                        "private": false,
+                        "encrypt": false,
+                        "isSystem": true
+                    },
                     {
                         "name": "labelSql",
                         "displayName": "Label SQL Query",
@@ -4681,7 +4693,7 @@
                     },
                     {
                         "name": "questionSqlDatasetConfigs",
-                        "displayName": "Question SQL Dataset Config",
+                        "displayName": "Related Dashboard Question SQL Dataset Config",
                         "description": "Related Question SQL Dataset Config Model",
                         "type": "relation",
                         "ormType": "integer",
@@ -4689,7 +4701,7 @@
                         "relationType": "one-to-many",
                         "relationCoModelFieldName": "question",
                         "relationCreateInverse": true,
-                        "relationCoModelSingularName": "questionSqlDatasetConfig",
+                        "relationCoModelSingularName": "dashboardQuestionSqlDatasetConfig",
                         "relationModelModuleName": "solid-core",
                         "relationCascade": "cascade",
                         "required": false,
@@ -4701,13 +4713,13 @@
                 ]
             },
             {
-                "singularName": "questionSqlDatasetConfig",
-                "pluralName": "questionSqlDatasetConfigs",
-                "displayName": "Question SQL Dataset Config",
-                "description": "This is used to maintain SQL dataset configurations for questions",
+                "singularName": "dashboardQuestionSqlDatasetConfig",
+                "pluralName": "dashboardQuestionSqlDatasetConfigs",
+                "displayName": "Dashboard Question SQL Dataset Config",
+                "description": "This is used to maintain Dashboard Question SQL dataset configurations",
                 "dataSource": "default",
                 "dataSourceType": "postgres",
-                "tableName": "ss_question_sql_dataset_config",
+                "tableName": "ss_dashboard_question_sql_dataset_config",
                 "userKeyFieldUserKey": "datasetName",
                 "fields": [
                     {
@@ -4811,7 +4823,7 @@
                         "relationType": "many-to-one",
                         "relationCoModelFieldName": "questionSqlDatasetConfigs",
                         "relationCreateInverse": true,
-                        "relationCoModelSingularName": "question",
+                        "relationCoModelSingularName": "dashboardQuestion",
                         "relationModelModuleName": "solid-core",
                         "relationCascade": "cascade",
                         "required": true,
@@ -4899,14 +4911,19 @@
                     {
                         "name": "status",
                         "displayName": "Status",
-                        "type": "shortText",
+                        "type": "selectionStatic",
                         "ormType": "varchar",
                         "length": 64,
                         "required": false,
                         "unique": false,
                         "index": true,
                         "private": false,
-                        "encrypt": false
+                        "encrypt": false,
+                        "selectionStaticValues": [
+                            "pending:Pending",
+                            "failed:Failed",
+                            "succeeded:Succeeded"
+                        ]
                     },
                     {
                         "name": "errorMessage",
@@ -5416,46 +5433,7 @@
             "type": "solid",
             "domain": "",
             "context": "",
-            "customComponent": "/admin/address-master/dashboardVariable/all",
-            "customIsModal": true,
-            "serverEndpoint": "",
-            "viewUserKey": "dashboardVariable-list-view",
-            "moduleUserKey": "solid-core",
-            "modelUserKey": "dashboardVariable"
-        },
-        {
-            "displayName": "Question List Action",
-            "name": "question-list-action",
-            "type": "solid",
-            "domain": "",
-            "context": "",
-            "customComponent": "/admin/address-master/question/all",
-            "customIsModal": true,
-            "serverEndpoint": "",
-            "viewUserKey": "question-list-view",
-            "moduleUserKey": "solid-core",
-            "modelUserKey": "question"
-        },
-        {
-            "displayName": "Dashboard List Action",
-            "name": "dashboard-list-action",
-            "type": "solid",
-            "domain": "",
-            "context": "",
-            "customComponent": "/admin/address-master/dashboard/all",
-            "customIsModal": true,
-            "serverEndpoint": "",
-            "viewUserKey": "dashboard-list-view",
-            "moduleUserKey": "solid-core",
-            "modelUserKey": "dashboard"
-        },
-        {
-            "displayName": "Dashboard Variable List Action",
-            "name": "dashboardVariable-list-action",
-            "type": "solid",
-            "domain": "",
-            "context": "",
-            "customComponent": "/admin/address-master/dashboardVariable/all",
+            "customComponent": "",
             "customIsModal": true,
             "serverEndpoint": "",
             "viewUserKey": "dashboardVariable-list-view",
@@ -5463,69 +5441,30 @@
             "modelUserKey": "dashboardVariable"
         },
         {
-            "displayName": "Question List Action",
-            "name": "question-list-action",
+            "displayName": "Dashboard Question List Action",
+            "name": "dashboardQuestion-list-action",
             "type": "solid",
             "domain": "",
             "context": "",
-            "customComponent": "/admin/address-master/question/all",
-            "customIsModal": true,
-            "serverEndpoint": "",
-            "viewUserKey": "question-list-view",
-            "moduleUserKey": "solid-core",
-            "modelUserKey": "question"
-        },
-        {
-            "displayName": "Question List Action",
-            "name": "question-list-action",
-            "type": "solid",
-            "domain": "",
-            "context": "",
-            "customComponent": "/admin/address-master/question/all",
-            "customIsModal": true,
-            "serverEndpoint": "",
-            "viewUserKey": "question-list-view",
-            "moduleUserKey": "solid-core",
-            "modelUserKey": "question"
-        },
-        {
-            "displayName": "Question List Action",
-            "name": "question-list-action",
-            "type": "solid",
-            "domain": "",
-            "context": "",
-            "customComponent": "/admin/address-master/question/all",
-            "customIsModal": true,
-            "serverEndpoint": "",
-            "viewUserKey": "question-list-view",
-            "moduleUserKey": "solid-core",
-            "modelUserKey": "question"
-        },
-        {
-            "displayName": "Question SQL Dataset Config List Action",
-            "name": "questionSqlDatasetConfig-list-action",
-            "type": "solid",
-            "domain": "",
-            "context": "",
-            "customComponent": "/admin/address-master/questionSqlDatasetConfig/all",
+            "customComponent": "",
             "customIsModal": true,
             "serverEndpoint": "",
-            "viewUserKey": "questionSqlDatasetConfig-list-view",
+            "viewUserKey": "dashboardQuestion-list-view",
             "moduleUserKey": "solid-core",
-            "modelUserKey": "questionSqlDatasetConfig"
+            "modelUserKey": "dashboardQuestion"
         },
         {
-            "displayName": "Question List Action",
-            "name": "question-list-action",
+            "displayName": "Dashboard Question SQL Dataset Config List Action",
+            "name": "dashboardQuestionSqlDatasetConfig-list-action",
             "type": "solid",
             "domain": "",
             "context": "",
-            "customComponent": "/admin/address-master/question/all",
+            "customComponent": "",
             "customIsModal": true,
             "serverEndpoint": "",
-            "viewUserKey": "question-list-view",
+            "viewUserKey": "dsahboardQuestionSqlDatasetConfig-list-view",
             "moduleUserKey": "solid-core",
-            "modelUserKey": "question"
+            "modelUserKey": "dashboardQuestionSqlDatasetConfig"
         },
         {
             "displayName": "AI Interactions",
@@ -5855,10 +5794,10 @@
             "parentMenuItemUserKey": "dashboard-root-menu-item"
         },
         {
-            "displayName": "Question",
-            "name": "question-menu-item",
+            "displayName": "Dashboard Question",
+            "name": "dashboardQuestion-menu-item",
             "sequenceNumber": 2,
-            "actionUserKey": "question-list-action",
+            "actionUserKey": "dashboardQuestion-list-action",
             "moduleUserKey": "solid-core",
             "parentMenuItemUserKey": "dashboard-root-menu-item"
         },
@@ -11418,12 +11357,12 @@
             }
         },
         {
-            "name": "question-list-view",
-            "displayName": "Question",
+            "name": "dashboardQuestion-list-view",
+            "displayName": "Dashboard Question",
             "type": "list",
             "context": "{}",
             "moduleUserKey": "solid-core",
-            "modelUserKey": "question",
+            "modelUserKey": "dashboardQuestion",
             "layout": {
                 "type": "list",
                 "attrs": {
@@ -11462,22 +11401,28 @@
                         "attrs": {
                             "name": "visualisedAs"
                         }
+                    },
+                    {
+                        "type": "field",
+                        "attrs": {
+                            "name": "sequenceNumber"
+                        }
                     }
                 ]
             }
         },
         {
-            "name": "question-form-view",
-            "displayName": "Question",
+            "name": "dashboardQuestion-form-view",
+            "displayName": "Dashboard Question",
             "type": "form",
             "context": "{}",
             "moduleUserKey": "solid-core",
-            "modelUserKey": "question",
+            "modelUserKey": "dashboardQuestion",
             "layout": {
                 "type": "form",
                 "attrs": {
                     "name": "form-1",
-                    "label": "Question",
+                    "label": "Dashboard Question",
                     "className": "grid"
                 },
                 "children": [
@@ -11531,6 +11476,12 @@
                                                                 "attrs": {
                                                                     "name": "visualisedAs"
                                                                 }
+                                                            },
+                                                            {
+                                                                "type": "field",
+                                                                "attrs": {
+                                                                    "name": "sequenceNumber"
+                                                                }
                                                             }
                                                         ]
                                                     },
@@ -11548,6 +11499,18 @@
                                                                     "name": "sourceType"
                                                                 }
                                                             },
+                                                            {
+                                                                "type": "field",
+                                                                "attrs": {
+                                                                    "name": "labelSql"
+                                                                }
+                                                            },
+                                                            {
+                                                                "type": "field",
+                                                                "attrs": {
+                                                                    "name": "kpiSql"
+                                                                }
+                                                            },
                                                             {
                                                                 "type": "field",
                                                                 "attrs": {
@@ -11627,7 +11590,7 @@
                                                             {
                                                                 "type": "field",
                                                                 "attrs": {
-                                                                    "name": "barChartLabelOptions"
+                                                                    "name": "chartOptions"
                                                                 }
                                                             }
                                                         ]
@@ -11661,12 +11624,12 @@
             }
         },
         {
-            "name": "questionSqlDatasetConfig-list-view",
-            "displayName": "Question SQL Dataset Config",
+            "name": "dashboardQuestionSqlDatasetConfig-list-view",
+            "displayName": "Dashboard Question SQL Dataset Config",
             "type": "list",
             "context": "{}",
             "moduleUserKey": "solid-core",
-            "modelUserKey": "questionSqlDatasetConfig",
+            "modelUserKey": "dashboardQuestionSqlDatasetConfig",
             "layout": {
                 "type": "list",
                 "attrs": {
@@ -11703,24 +11666,24 @@
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "backgroundColor"
+                            "name": "options"
                         }
                     }
                 ]
             }
         },
         {
-            "name": "questionSqlDatasetConfig-form-view",
-            "displayName": "Question SQL Dataset Config",
+            "name": "dashboardQuestionSqlDatasetConfig-form-view",
+            "displayName": "Dashboard Question SQL Dataset Config",
             "type": "form",
             "context": "{}",
             "moduleUserKey": "solid-core",
-            "modelUserKey": "questionSqlDatasetConfig",
+            "modelUserKey": "dashboardQuestionSqlDatasetConfig",
             "layout": {
                 "type": "form",
                 "attrs": {
                     "name": "form-1",
-                    "label": "Question SQL Dataset Config",
+                    "label": "Dashboard Question SQL Dataset Config",
                     "className": "grid"
                 },
                 "children": [
@@ -11782,12 +11745,6 @@
                                                     "name": "valueColumnName"
                                                 }
                                             },
-                                            {
-                                                "type": "field",
-                                                "attrs": {
-                                                    "name": "backgroundColor"
-                                                }
-                                            },
                                             {
                                                 "type": "field",
                                                 "attrs": {

package/dist/services/ai-interaction.service.d.ts

@@ -7,6 +7,9 @@ import { ConfigService } from '@nestjs/config';
 import { FileService } from 'src/services/file.service';
 import { CrudHelperService } from 'src/services/crud-helper.service';
 import { AiInteraction } from '../entities/ai-interaction.entity';
+import { McpResponse, TriggerMcpClientOptions } from 'src/interfaces';
+import { PublisherFactory } from './queues/publisher-factory.service';
+import { RequestContextService } from './request-context.service';
 export declare class AiInteractionService extends CRUDService<AiInteraction> {
     readonly modelMetadataService: ModelMetadataService;
     readonly moduleMetadataService: ModuleMetadataService;
@@ -17,7 +20,12 @@ export declare class AiInteractionService extends CRUDService<AiInteraction> {
     readonly entityManager: EntityManager;
     readonly repo: Repository<AiInteraction>;
     readonly moduleRef: ModuleRef;
-    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<AiInteraction>, moduleRef: ModuleRef);
-    runMcpPrompt(prompt: string): Promise<any>;
+    readonly publisherFactory: PublisherFactory<TriggerMcpClientOptions>;
+    readonly requestContextService: RequestContextService;
+    private readonly logger;
+    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<AiInteraction>, moduleRef: ModuleRef, publisherFactory: PublisherFactory<TriggerMcpClientOptions>, requestContextService: RequestContextService);
+    triggerMcpClientJob(prompt: string): Promise<string>;
+    runMcpPrompt(prompt: string): Promise<McpResponse>;
+    cleanResponse(response: string): string;
 }
 //# sourceMappingURL=ai-interaction.service.d.ts.map

package/dist/services/ai-interaction.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai-interaction.service.d.ts","sourceRoot":"","sources":["../../src/services/ai-interaction.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAgBlE,qBACa,oBAAqB,SAAQ,WAAW,CAAC,aAAa,CAAC;IAEhE,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,SAAS;gBAVpB,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC,EAC/B,SAAS,EAAE,SAAS;IAWzB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CA0EjD"}
+{"version":3,"file":"ai-interaction.service.d.ts","sourceRoot":"","sources":["../../src/services/ai-interaction.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAGlE,qBACa,oBAAqB,SAAQ,WAAW,CAAC,aAAa,CAAC;IAIhE,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,uBAAuB,CAAC;IACpE,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IAfvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;gBAGrD,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC,EAC/B,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,EAC3D,qBAAqB,EAAE,qBAAqB;IAMjD,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA8BpD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA2ExD,aAAa,CAAC,QAAQ,EAAE,MAAM;CAe/B"}

package/dist/services/ai-interaction.service.js

@@ -44,6 +44,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var AiInteractionService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AiInteractionService = void 0;
 const common_1 = require("@nestjs/common");
@@ -59,8 +60,10 @@ const crud_helper_service_1 = require("./crud-helper.service");
 const child_process_1 = require("child_process");
 const ai_interaction_entity_1 = require("../entities/ai-interaction.entity");
 const fs = __importStar(require("fs/promises"));
-let AiInteractionService = class AiInteractionService extends crud_service_1.CRUDService {
-    constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, moduleRef) {
+const publisher_factory_service_1 = require("./queues/publisher-factory.service");
+const request_context_service_1 = require("./request-context.service");
+let AiInteractionService = AiInteractionService_1 = class AiInteractionService extends crud_service_1.CRUDService {
+    constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, moduleRef, publisherFactory, requestContextService) {
         super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);
         this.modelMetadataService = modelMetadataService;
         this.moduleMetadataService = moduleMetadataService;
@@ -71,6 +74,31 @@ let AiInteractionService = class AiInteractionService extends crud_service_1.CRU
         this.entityManager = entityManager;
         this.repo = repo;
         this.moduleRef = moduleRef;
+        this.publisherFactory = publisherFactory;
+        this.requestContextService = requestContextService;
+        this.logger = new common_1.Logger(AiInteractionService_1.name);
+    }
+    async triggerMcpClientJob(prompt) {
+        const activeUser = this.requestContextService.getActiveUser();
+        const aiInteraction = await this.create({
+            userId: activeUser.sub,
+            threadId: `thread-${activeUser.sub}`,
+            role: 'human',
+            message: prompt,
+            contentType: '',
+            errorMessage: '',
+            modelUsed: '',
+            responseTimeMs: 0,
+            metadata: ''
+        });
+        const m = {
+            payload: {
+                aiInteractionId: aiInteraction.id,
+            },
+            parentEntity: 'aiInteraction',
+            parentEntityId: aiInteraction.id,
+        };
+        return await this.publisherFactory.publish(m, 'TriggerMcpClientPublisher');
     }
     async runMcpPrompt(prompt) {
         const pythonExecutable = process.env.MCP_PYTHON_EXECUTABLE;
@@ -94,6 +122,8 @@ let AiInteractionService = class AiInteractionService extends crud_service_1.CRU
             throw new common_1.BadRequestException(`Invalid MCP executable or client path: ${err.message}`);
         }
         return new Promise((resolve, reject) => {
+            this.logger.log(`Attempting to run command:`);
+            this.logger.log(`${pythonExecutable} ${mcpClient} ${prompt}`);
             const python = (0, child_process_1.spawn)(pythonExecutable, [mcpClient, prompt]);
             let stdout = '';
             let stderr = '';
@@ -104,33 +134,36 @@ let AiInteractionService = class AiInteractionService extends crud_service_1.CRU
                 stderr += data.toString();
             });
             python.on('close', (code) => {
+                this.logger.log(`Python script exited with code ${code}`);
                 if (code !== 0) {
-                    return reject(new Error(`Python script exited with code ${code}: ${stderr}`));
+                    this.logger.error(`Python script exited with a non-zero exit code: ${stderr}`);
+                    return reject(new Error(`Python script exited with a non-zero exit code: ${stderr}`));
                 }
                 try {
+                    this.logger.log(`Python script exited with zero exit code: ${stdout}`);
                     const raw = JSON.parse(stdout);
-                    if (!raw.success) {
-                        return reject(new Error(`MCP error: ${raw.errors?.join(', ')}`));
-                    }
-                    let cleaned = raw.response.trim();
-                    if (cleaned.startsWith('```json')) {
-                        cleaned = cleaned.replace(/^```json/, '').trim();
-                    }
-                    if (cleaned.endsWith('```')) {
-                        cleaned = cleaned.replace(/```$/, '').trim();
-                    }
-                    const parsed = JSON.parse(cleaned);
-                    resolve(parsed);
+                    resolve(raw);
                 }
                 catch (err) {
-                    reject(new Error(`Failed to parse JSON: ${err.message}`));
+                    reject(new Error(`Mcp Invocation Failed: ${err.message}`));
                 }
             });
         });
     }
+    cleanResponse(response) {
+        this.logger.log(`mcp server response is: ${response}`);
+        if (response.startsWith('```json')) {
+            response = response.replace(/^```json/, '').trim();
+        }
+        if (response.endsWith('```')) {
+            response = response.replace(/```$/, '').trim();
+        }
+        this.logger.log(`mcp server response after removing doc tags is: ${response}`);
+        return response;
+    }
 };
 exports.AiInteractionService = AiInteractionService;
-exports.AiInteractionService = AiInteractionService = __decorate([
+exports.AiInteractionService = AiInteractionService = AiInteractionService_1 = __decorate([
     (0, common_1.Injectable)(),
     __param(6, (0, typeorm_1.InjectEntityManager)()),
     __param(7, (0, typeorm_1.InjectRepository)(ai_interaction_entity_1.AiInteraction, 'default')),
@@ -142,6 +175,8 @@ exports.AiInteractionService = AiInteractionService = __decorate([
         crud_helper_service_1.CrudHelperService,
         typeorm_2.EntityManager,
         typeorm_2.Repository,
-        core_1.ModuleRef])
+        core_1.ModuleRef,
+        publisher_factory_service_1.PublisherFactory,
+        request_context_service_1.RequestContextService])
 ], AiInteractionService);
 //# sourceMappingURL=ai-interaction.service.js.map

package/dist/services/ai-interaction.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"ai-interaction.service.js","sourceRoot":"","sources":["../../src/services/ai-interaction.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { BadRequestException, Injectable } from '@nestjs/common';\nimport { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';\nimport { DiscoveryService, ModuleRef } from \"@nestjs/core\";\nimport { EntityManager, Repository } from 'typeorm';\n\nimport { CRUDService } from 'src/services/crud.service';\nimport { ModelMetadataService } from 'src/services/model-metadata.service';\nimport { ModuleMetadataService } from 'src/services/module-metadata.service';\nimport { ConfigService } from '@nestjs/config';\nimport { FileService } from 'src/services/file.service';\nimport { CrudHelperService } from 'src/services/crud-helper.service';\nimport { spawn } from 'child_process';\nimport { AiInteraction } from '../entities/ai-interaction.entity';\nimport * as fs from 'fs/promises';\nimport * as path from 'path';\n\ninterface McpResponse {\n  success: boolean;\n  request: string;\n  response: string;\n  model?: string;\n  tools_invoked?: string[];\n  tool_calls?: any[];\n  duration_ms?: number;\n  errors?: string[];\n  trace?: string[];\n}\n\n@Injectable()\nexport class AiInteractionService extends CRUDService<AiInteraction> {\n  constructor(\n    readonly modelMetadataService: ModelMetadataService,\n    readonly moduleMetadataService: ModuleMetadataService,\n    readonly configService: ConfigService,\n    readonly fileService: FileService,\n    readonly discoveryService: DiscoveryService,\n    readonly crudHelperService: CrudHelperService,\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    @InjectRepository(AiInteraction, 'default')\n    readonly repo: Repository<AiInteraction>,\n    readonly moduleRef: ModuleRef\n\n  ) {\n    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);\n  }\n\n  /**\n   * Runs the Python MCP client with a prompt and returns the parsed JSON embedded in the 'response'.\n   * @param prompt - The question or instruction to send to the MCP client.\n   * @returns The parsed object inside the 'response' field of the JSON output.\n   */\n  async runMcpPrompt(prompt: string): Promise<any> {\n    const pythonExecutable = process.env.MCP_PYTHON_EXECUTABLE;\n    const mcpClient = process.env.MCP_CLIENT;\n\n    // TODO: We can return an error if the above env variables are not properly setup...\n    if (!pythonExecutable || !mcpClient) {\n      throw new BadRequestException('SolidX AI MCP python executable or client path not configured.');\n    }\n\n    // Check if both paths are valid and accessible\n    try {\n      const [pyStat, clientStat] = await Promise.all([\n        fs.stat(pythonExecutable),\n        fs.stat(mcpClient),\n      ]);\n\n      if (!pyStat.isFile()) {\n        throw new BadRequestException(`MCP_PYTHON_EXECUTABLE path is not a file: ${pythonExecutable}`);\n      }\n\n      if (!clientStat.isFile()) {\n        throw new BadRequestException(`MCP_CLIENT path is not a file: ${mcpClient}`);\n      }\n\n    } catch (err: any) {\n      throw new BadRequestException(`Invalid MCP executable or client path: ${err.message}`);\n    }\n\n    return new Promise((resolve, reject) => {\n\n      const python = spawn(pythonExecutable, [mcpClient, prompt]);\n\n      let stdout = '';\n      let stderr = '';\n\n      python.stdout.on('data', (data) => {\n        stdout += data.toString();\n      });\n\n      python.stderr.on('data', (data) => {\n        stderr += data.toString();\n      });\n\n      python.on('close', (code) => {\n        if (code !== 0) {\n          return reject(new Error(`Python script exited with code ${code}: ${stderr}`));\n        }\n\n        try {\n          const raw: McpResponse = JSON.parse(stdout);\n\n          if (!raw.success) {\n            return reject(new Error(`MCP error: ${raw.errors?.join(', ')}`));\n          }\n\n          let cleaned = raw.response.trim();\n\n          // Remove markdown-style code block wrapper\n          if (cleaned.startsWith('```json')) {\n            cleaned = cleaned.replace(/^```json/, '').trim();\n          }\n          if (cleaned.endsWith('```')) {\n            cleaned = cleaned.replace(/```$/, '').trim();\n          }\n\n          const parsed = JSON.parse(cleaned);\n          resolve(parsed);\n        } catch (err: any) {\n          reject(new Error(`Failed to parse JSON: ${err.message}`));\n        }\n      });\n    });\n  }\n\n}\n"]}
+{"version":3,"file":"ai-interaction.service.js","sourceRoot":"","sources":["../../src/services/ai-interaction.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { BadRequestException, Logger, Injectable } from '@nestjs/common';\nimport { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';\nimport { DiscoveryService, ModuleRef } from \"@nestjs/core\";\nimport { EntityManager, Repository } from 'typeorm';\n\nimport { CRUDService } from 'src/services/crud.service';\nimport { ModelMetadataService } from 'src/services/model-metadata.service';\nimport { ModuleMetadataService } from 'src/services/module-metadata.service';\nimport { ConfigService } from '@nestjs/config';\nimport { FileService } from 'src/services/file.service';\nimport { CrudHelperService } from 'src/services/crud-helper.service';\nimport { spawn } from 'child_process';\nimport { AiInteraction } from '../entities/ai-interaction.entity';\nimport * as fs from 'fs/promises';\nimport { McpResponse, TriggerMcpClientOptions } from 'src/interfaces';\nimport { PublisherFactory } from './queues/publisher-factory.service';\nimport { RequestContextService } from './request-context.service';\nimport { ActiveUserData } from 'src/interfaces/active-user-data.interface';\n\n@Injectable()\nexport class AiInteractionService extends CRUDService<AiInteraction> {\n  private readonly logger = new Logger(AiInteractionService.name);\n\n  constructor(\n    readonly modelMetadataService: ModelMetadataService,\n    readonly moduleMetadataService: ModuleMetadataService,\n    readonly configService: ConfigService,\n    readonly fileService: FileService,\n    readonly discoveryService: DiscoveryService,\n    readonly crudHelperService: CrudHelperService,\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    @InjectRepository(AiInteraction, 'default')\n    readonly repo: Repository<AiInteraction>,\n    readonly moduleRef: ModuleRef,\n    readonly publisherFactory: PublisherFactory<TriggerMcpClientOptions>,\n    readonly requestContextService: RequestContextService,\n\n  ) {\n    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);\n  }\n\n  async triggerMcpClientJob(prompt: string): Promise<string> {\n    const activeUser: ActiveUserData = this.requestContextService.getActiveUser();\n\n    const aiInteraction = await this.create({\n      userId: activeUser.sub,\n      threadId: `thread-${activeUser.sub}`,\n      role: 'human',\n      message: prompt,\n      contentType: '',\n      errorMessage: '',\n      modelUsed: '',\n      responseTimeMs: 0,\n      metadata: ''\n    });\n    const m = {\n      payload: {\n        aiInteractionId: aiInteraction.id,\n      },\n      parentEntity: 'aiInteraction',\n      parentEntityId: aiInteraction.id,\n    };\n\n    return await this.publisherFactory.publish(m, 'TriggerMcpClientPublisher');\n  }\n\n  /**\n   * Runs the Python MCP client with a prompt and returns the parsed JSON embedded in the 'response'.\n   * @param prompt - The question or instruction to send to the MCP client.\n   * @returns The parsed object inside the 'response' field of the JSON output.\n   */\n  async runMcpPrompt(prompt: string): Promise<McpResponse> {\n    const pythonExecutable = process.env.MCP_PYTHON_EXECUTABLE;\n    const mcpClient = process.env.MCP_CLIENT;\n\n    // TODO: We can return an error if the above env variables are not properly setup...\n    if (!pythonExecutable || !mcpClient) {\n      throw new BadRequestException('SolidX AI MCP python executable or client path not configured.');\n    }\n\n    // Check if both paths are valid and accessible\n    try {\n      const [pyStat, clientStat] = await Promise.all([\n        fs.stat(pythonExecutable),\n        fs.stat(mcpClient),\n      ]);\n\n      if (!pyStat.isFile()) {\n        throw new BadRequestException(`MCP_PYTHON_EXECUTABLE path is not a file: ${pythonExecutable}`);\n      }\n\n      if (!clientStat.isFile()) {\n        throw new BadRequestException(`MCP_CLIENT path is not a file: ${mcpClient}`);\n      }\n\n    } catch (err: any) {\n      throw new BadRequestException(`Invalid MCP executable or client path: ${err.message}`);\n    }\n\n    // TODO: Refactor to use the command.service.ts instead...\n    return new Promise((resolve, reject) => {\n      this.logger.log(`Attempting to run command:`)\n      this.logger.log(`${pythonExecutable} ${mcpClient} ${prompt}`);\n\n      const python = spawn(pythonExecutable, [mcpClient, prompt]);\n\n      let stdout = '';\n      let stderr = '';\n\n      python.stdout.on('data', (data) => {\n        stdout += data.toString();\n      });\n\n      python.stderr.on('data', (data) => {\n        stderr += data.toString();\n      });\n\n      python.on('close', (code) => {\n        this.logger.log(`Python script exited with code ${code}`);\n\n        if (code !== 0) {\n          this.logger.error(`Python script exited with a non-zero exit code: ${stderr}`);\n          return reject(new Error(`Python script exited with a non-zero exit code: ${stderr}`));\n        }\n\n        try {\n          this.logger.log(`Python script exited with zero exit code: ${stdout}`);\n          const raw: McpResponse = JSON.parse(stdout);\n\n          // if (!raw.success) {\n          //   return reject(new Error(`MCP error: ${raw.errors?.join(', ')}`));\n          // }\n          // let cleaned = raw.response.trim();\n\n          // Don't need to re-parse this...\n          // const parsed = JSON.parse(cleaned);\n          // resolve(cleaned);\n\n          resolve(raw);\n        } catch (err: any) {\n          reject(new Error(`Mcp Invocation Failed: ${err.message}`));\n        }\n      });\n    });\n  }\n\n  cleanResponse(response: string) {\n    this.logger.log(`mcp server response is: ${response}`);\n\n    // Remove markdown-style code block wrapper\n    if (response.startsWith('```json')) {\n      response = response.replace(/^```json/, '').trim();\n    }\n    if (response.endsWith('```')) {\n      response = response.replace(/```$/, '').trim();\n    }\n    this.logger.log(`mcp server response after removing doc tags is: ${response}`);\n\n    return response;\n  }\n\n}\n"]}

package/dist/services/chatter-message.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chatter-message.service.d.ts","sourceRoot":"","sources":["../../src/services/chatter-message.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAG,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,qBACa,qBAAsB,SAAQ,WAAW,CAAC,cAAc,CAAC;IAElE,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC;IAEzC,QAAQ,CAAC,yBAAyB,EAAE,UAAU,CAAC,qBAAqB,CAAC;IACrE,QAAQ,CAAC,SAAS,EAAE,SAAS;IAE7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;gBAf5C,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC,EAEhC,yBAAyB,EAAE,UAAU,CAAC,qBAAqB,CAAC,EAC5D,SAAS,EAAE,SAAS,EAEZ,iBAAiB,EAAE,UAAU,CAAC,aAAa,CAAC,EACpD,qBAAqB,EAAE,qBAAqB;IAKlD,WAAW,CAAC,OAAO,EAAE,qBAAqB,EAAE,KAAK,GAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAO;IA4C7E,wBAAwB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,YAAY,GAAE,OAAe;IAsD9F,wBAAwB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAE,OAAe;IAwElH,wBAAwB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAE,OAAe;IAkCxH,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,uBAAuB;IAsB/B,OAAO,CAAC,eAAe;CAmBtB"}
+{"version":3,"file":"chatter-message.service.d.ts","sourceRoot":"","sources":["../../src/services/chatter-message.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAG,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,qBACa,qBAAsB,SAAQ,WAAW,CAAC,cAAc,CAAC;IAElE,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC;IAEzC,QAAQ,CAAC,yBAAyB,EAAE,UAAU,CAAC,qBAAqB,CAAC;IACrE,QAAQ,CAAC,SAAS,EAAE,SAAS;IAE7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;gBAf5C,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC,EAEhC,yBAAyB,EAAE,UAAU,CAAC,qBAAqB,CAAC,EAC5D,SAAS,EAAE,SAAS,EAEZ,iBAAiB,EAAE,UAAU,CAAC,aAAa,CAAC,EACpD,qBAAqB,EAAE,qBAAqB;IAKlD,WAAW,CAAC,OAAO,EAAE,qBAAqB,EAAE,KAAK,GAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAO;IA4C7E,wBAAwB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,YAAY,GAAE,OAAe;IAsD9F,wBAAwB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAE,OAAe;IAwElH,wBAAwB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAE,OAAe;IAkCxH,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,uBAAuB;IAsB/B,OAAO,CAAC,eAAe;CAyBtB"}