@solidstarters/solid-core 1.2.172 → 1.2.174

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.172",
+  "version": "1.2.174",
   "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/controllers/ai-interaction.controller.ts

@@ -95,7 +95,7 @@ export class AiInteractionController {
   @ApiBearerAuth("jwt")
   @Post('/trigger-mcp-client-job')
   async triggerMcpClientJob(@Body() dto: InvokeAiPromptDto, @ActiveUser() activeUser: ActiveUserData) {
-    return this.service.triggerMcpClientJob(dto.prompt, activeUser.sub);
+    return this.service.triggerMcpClientJob(dto,activeUser.sub);
   }
 
   @ApiBearerAuth("jwt")

package/src/controllers/service.controller.ts

@@ -36,9 +36,9 @@ export class ServiceController {
         // If failure then decide shape to return.
 
         const threadId = `pingPongTxn-${activeUser.sub}`;
-
+        const dto ={prompt:"Can you do 1 + 1", moduleName:"solidCoreModule"}
         const { queueMessageId, aiInteractionId } = await this.aiInteractionService.triggerMcpClientJob(
-            `Can you do 1 + 1`,
+            dto,
             activeUser.sub,
             true,
             threadId

package/src/dtos/invoke-ai-prompt.dto.ts

@@ -1,6 +1,10 @@
-import { IsString } from 'class-validator';
+import { IsOptional, IsString } from 'class-validator';
 
 export class InvokeAiPromptDto {
     @IsString()
     prompt: string;
+
+    @IsOptional()
+    @IsString()
+    moduleName: string;
 }

package/src/entities/user.entity.ts

@@ -111,4 +111,6 @@ export class User extends CommonEntity {
     // dont send to client
     @Column({ type: "timestamp", nullable: true })
     rehashedAt: Date;
+    @Expose()
+    _media: any;
 }

package/src/interfaces.ts

@@ -66,6 +66,7 @@ export interface CodeGenerationOptions {
 
 export interface TriggerMcpClientOptions {
   aiInteractionId: number;
+  moduleName:string;
 }
 
 export interface McpResponse {
@@ -77,7 +78,7 @@ export interface McpResponse {
   tool_calls?: any[];
   duration_ms?: number;
   errors?: string[];
-  trace?: string[];
+  error_trace?: string[];
   content_type?: string;
 }
 

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

@@ -3,7 +3,7 @@ import { Injectable, Logger } from '@nestjs/common';
 import { QueueMessage } from 'src/interfaces/mq';
 import { MqMessageService } from '../../services/mq-message.service';
 import { MqMessageQueueService } from '../../services/mq-message-queue.service';
-import { QueuesModuleOptions, TriggerMcpClientOptions } from "../../interfaces";
+import { McpResponse, QueuesModuleOptions, TriggerMcpClientOptions } from "../../interfaces";
 import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
 import triggerMcpClientQueueOptions from "./trigger-mcp-client-queue-options";
 import { AiInteractionService } from 'src/services/ai-interaction.service';
@@ -28,6 +28,36 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
         }
     }
 
+    cleanNestedResponse(aiResponse: McpResponse) {
+        let nestedResponse: any;
+
+        try {
+            let raw = aiResponse.response;
+
+            if (typeof raw === "string") {
+                raw = raw.trim();
+                try {
+                    // Try to parse as JSON
+                    nestedResponse = JSON.parse(raw);
+                } catch {
+                    // Not JSON, just keep as string
+                    nestedResponse = raw;
+                }
+            } else if (typeof raw === "object" && raw !== null) {
+                // Already JSON
+                nestedResponse = raw;
+            } else {
+                // Fallback
+                nestedResponse = String(raw);
+            }
+        } catch (err) {
+            this.triggerMcpClientSubscriberLogger.error("Error processing AI response:", err);
+            nestedResponse = `Error handling response: ${err?.message || String(err)}`;
+        }
+
+        return nestedResponse;
+    }
+
     async subscribe(message: QueueMessage<TriggerMcpClientOptions>) {
         this.triggerMcpClientSubscriberLogger.debug(`Received message: ${JSON.stringify(message)}`);
 
@@ -48,50 +78,103 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
         // Use this to invoke our mcp client
         // TODO: try / catch ... 
         // Handle the rejection gracefully...
-        const aiResponse = await this.aiInteractionService.runMcpPrompt(prompt);
+
+        // We create the aiInteraction entry first 
+        const genAiInteraction = await this.aiInteractionService.create({
+            userId: aiInteraction.user.id,
+            threadId: aiInteraction.threadId,
+            parentInteractionId: aiInteraction.id,
+            role: 'gen-ai',
+            message: '...', // Updated in the tool
+            contentType: '', // Updated in the tool
+            errorMessage: '', // Updated after we receive the response
+            modelUsed: '', // Updated after we receive the response
+            responseTimeMs: 0, // Updated after we receive the response
+            metadata: '', // Updated in the tool
+            isApplied: false, // Updated after we receive the response
+            status: '' // Updated after we receive the response
+        });
+
+        const finalPrompt = `
+        # User Prompt: 
+        ${prompt}
+        
+        # System Instructions:
+        - aiInteractionId: ${genAiInteraction.id}
+        - moduleName:${message.payload.moduleName}
+        - You will be invoking tools if needed.
+        - If a tool is invoked, you must return **exactly** the raw output from the tool, without any additional formatting, commentary, or text.
+        - Do not wrap the result in quotes, JSON, or markdown fences.
+        - Do not explain what the result means.
+        - Your final response must be identical to the tool output.
+        `
+
+        const aiResponse = await this.aiInteractionService.runMcpPrompt(finalPrompt);
         this.triggerMcpClientSubscriberLogger.log(`aiResponse: `);
         this.triggerMcpClientSubscriberLogger.log(JSON.stringify(aiResponse));
 
         if (!aiResponse.success) {
             this.triggerMcpClientSubscriberLogger.log(`Gen ai has returned with a false status code`);
 
-            const errorsStr = aiResponse.errors.join('; ');
-
-            await this.aiInteractionService.create({
-                userId: aiInteraction.user.id,
-                threadId: aiInteraction.threadId,
-                parentInteractionId: aiInteraction.id,
-                role: 'gen-ai',
-                message: '-',
-                contentType: aiResponse.content_type,
-                errorMessage: errorsStr,
+            const errorsStr = aiResponse.errors.join('\n ');
+            const errorTrace = aiResponse.error_trace.join('\n');
+
+            // await this.aiInteractionService.create({
+            //     userId: aiInteraction.user.id,
+            //     threadId: aiInteraction.threadId,
+            //     parentInteractionId: aiInteraction.id,
+            //     role: 'gen-ai',
+            //     message: '-',
+            //     contentType: aiResponse.content_type,
+            //     errorMessage: errorsStr,
+            //     modelUsed: aiResponse.model,
+            //     responseTimeMs: aiResponse.duration_ms,
+            //     metadata: JSON.stringify(aiResponse, null, 2),
+            //     isApplied: aiInteraction.isApplied,
+            //     status: aiResponse.success ? 'succeeded' : 'failed'
+            // });
+
+            // TODO: Update the previously created genAiInteraction record with the respective error fields and save to DB
+            await this.aiInteractionService.update(genAiInteraction.id, {
+                // contentType: aiResponse.content_type,
+                errorMessage: `${errorsStr}\n\n${errorTrace}`,
                 modelUsed: aiResponse.model,
                 responseTimeMs: aiResponse.duration_ms,
-                metadata: JSON.stringify(aiResponse, null, 2),
                 isApplied: aiInteraction.isApplied,
                 status: aiResponse.success ? 'succeeded' : 'failed'
-            });
+            }, [], true);
 
             // update the job entry with failure... raising an error will lead the job to be marked as failed...
             throw new Error(errorsStr);
         }
         else {
-            let nestedResponse = aiResponse.response.trim();
-
-            const genAiInteraction = await this.aiInteractionService.create({
-                userId: aiInteraction.user.id,
-                threadId: aiInteraction.threadId,
-                parentInteractionId: aiInteraction.id,
-                role: 'gen-ai',
-                message: nestedResponse,
-                contentType: aiResponse.content_type,
+            // let nestedResponse = this.cleanNestedResponse(aiResponse);
+
+            // const genAiInteraction = await this.aiInteractionService.create({
+            //     userId: aiInteraction.user.id,
+            //     threadId: aiInteraction.threadId,
+            //     parentInteractionId: aiInteraction.id,
+            //     role: 'gen-ai',
+            //     message: nestedResponse,
+            //     contentType: aiResponse.content_type,
+            //     errorMessage: '',
+            //     modelUsed: aiResponse.model,
+            //     responseTimeMs: aiResponse.duration_ms,
+            //     metadata: JSON.stringify(aiResponse, null, 2),
+            //     isApplied: aiInteraction.isApplied,
+            //     status: aiResponse.success ? 'succeeded' : 'failed'
+            // });
+
+            // TODO: Update the previously created genAiInteraction record with the respective success fields and save to DB
+            await this.aiInteractionService.update(genAiInteraction.id, {
+                // contentType: aiResponse.content_type,
                 errorMessage: '',
+                // message: nestedResponse,
                 modelUsed: aiResponse.model,
                 responseTimeMs: aiResponse.duration_ms,
-                metadata: JSON.stringify(aiResponse, null, 2),
                 isApplied: aiInteraction.isApplied,
                 status: aiResponse.success ? 'succeeded' : 'failed'
-            });
+            }, [], true);
 
             // If the human interaction was with isAutoApply=true, then we can go ahead and autoApply.
             if (aiInteraction.isAutoApply) {

package/src/repository/chatter-message-details.repository.ts

@@ -37,17 +37,16 @@ export class ChatterMessageDetailsRepository extends SolidBaseRepository<Chatter
   ): SelectQueryBuilder<ChatterMessageDetails> {
     const activeUser = this.requestContextService.getActiveUser();
     let qb = super.createQueryBuilder(alias, queryRunner);
-
-    // Join the real relation so we can access co_model_* fields
-    qb = qb.leftJoin(`${alias}.chatterMessage`, 'chatterMessage');
+    if (!activeUser) return qb;
 
     // Example: join the "client" co-model (pass whatever co-model name you need)
     const [coModelName, coModelAlias] = this.getCoModelNameAndAlias();
+    if (!coModelName) return qb;
 
+    // Join the real relation so we can access co_model_* fields
+    qb = qb.leftJoin(`${alias}.chatterMessage`, 'chatterMessage');
     qb = this.leftJoinCoModel(qb, coModelName, 'chatterMessage');
 
-    if (!activeUser) return qb;
-
     // If your security rules should apply to the co-model rows, pass the co-model alias.
     // Here we use the co-model name "client" both as model key and alias base for consistency.
     return this.securityRuleRepository.applySecurityRules(
@@ -102,6 +101,8 @@ export class ChatterMessageDetailsRepository extends SolidBaseRepository<Chatter
     if (!requestFilter) return [undefined, undefined];
 
     const coModelName = get(requestFilter, this.CO_MODEL_NAME_PATH);
+    if (!coModelName) return [undefined, undefined];
+
     const alias = camelize(coModelName);
     return [coModelName, alias];
   }

package/src/repository/chatter-message.repository.ts

@@ -26,6 +26,7 @@ export class ChatterMessageRepository extends SolidBaseRepository<ChatterMessage
         
         //Left join on the associated chatter model entity
         const [coModelName, coModelAlias] = this.getCoModelNameAndAlias();
+        if (!coModelName) return qb;
         qb = this.leftJoinCoModel(qb, coModelName);
         
         return this.securityRuleRepository.applySecurityRules(
@@ -61,6 +62,7 @@ export class ChatterMessageRepository extends SolidBaseRepository<ChatterMessage
         if (!requestFilter) return [undefined, undefined];
 
         const coModelName = get(requestFilter, this.CO_MODEL_NAME_PATH);
+        if (!coModelName) return [undefined, undefined];
         const alias = camelize(coModelName);
         return [coModelName, alias];
     }

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

@@ -12059,7 +12059,7 @@
           {
             "type": "field",
             "attrs": {
-              "name": "modelUsed"
+              "name": "contentType"
             }
           },
           {
@@ -12067,6 +12067,24 @@
             "attrs": {
               "name": "responseTimeMs"
             }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "inputTokens"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "outputTokens"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "totalTokens"
+            }
           }
         ]
       }
@@ -12184,6 +12202,24 @@
                                 "attrs": {
                                   "name": "parentInteraction"
                                 }
+                              },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "inputTokens"
+                                }
+                              },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "outputTokens"
+                                }
+                              },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "totalTokens"
+                                }
                               }
                             ]
                           }
@@ -12249,7 +12285,7 @@
                             "type": "column",
                             "attrs": {
                               "name": "col-meta",
-                              "label": "Metadata",
+                              "label": "",
                               "className": "col-12"
                             },
                             "children": [
@@ -12257,8 +12293,7 @@
                                 "type": "field",
                                 "attrs": {
                                   "name": "metadata",
-                                  "editWidget": "codeEditor",
-                                  "editorLanguage": "json"
+                                  "height": "80vh"
                                 }
                               }
                             ]

package/src/services/ai-interaction.service.ts

@@ -18,6 +18,7 @@ import { RequestContextService } from './request-context.service';
 import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 import { McpToolResponseHandlerFactory } from './mcp-tool-response-handlers/mcp-tool-response-handler-factory.service';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
+import { InvokeAiPromptDto } from 'src/dtos/invoke-ai-prompt.dto';
 
 @Injectable()
 export class AiInteractionService extends CRUDService<AiInteraction> {
@@ -43,14 +44,14 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
     super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);
   }
 
-  async triggerMcpClientJob(prompt: string, userId: number, isAutoApply: boolean = false, threadId: string = null): Promise<any> {
+  async triggerMcpClientJob(dto: InvokeAiPromptDto, userId: number, isAutoApply: boolean = false, threadId: string = null): Promise<any> {
     // const activeUser: ActiveUserData = this.requestContextService.getActiveUser();
 
     const aiInteraction = await this.create({
       userId: userId,
       threadId: threadId ? threadId : `thread-${userId}`,
       role: 'human',
-      message: prompt,
+      message: dto.prompt,
       contentType: '',
       errorMessage: '',
       modelUsed: '',
@@ -61,6 +62,7 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
     const m = {
       payload: {
         aiInteractionId: aiInteraction.id,
+        moduleName:dto.moduleName
       },
       parentEntity: 'aiInteraction',
       parentEntityId: aiInteraction.id,
@@ -137,6 +139,25 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
           this.logger.log(`Python script exited with zero exit code: ${stdout}`);
           const raw: McpResponse = JSON.parse(stdout);
 
+          // Sometimes the raw.response might not be a valid json
+          // TODO: examine the content type of the raw response..
+          // if (raw.content_type==='json') {
+          // }
+          let parsedResponse = raw.response;
+          try {
+            parsedResponse = JSON.parse(raw.response);
+          }
+          catch (ex) {
+            this.logger.warn(`Attempting to parse mcp client response assuming it is JSON, however it is not: ${parsedResponse}`);
+          }
+          // Parse the response string into an object
+          // const parsedResponse = JSON.parse(raw.response);
+
+          // Replace the string with the parsed object
+          const enrichedRaw = {
+            ...raw,
+            response: parsedResponse,
+          };
           // if (!raw.success) {
           //   return reject(new Error(`MCP error: ${raw.errors?.join(', ')}`));
           // }
@@ -146,7 +167,7 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
           // const parsed = JSON.parse(cleaned);
           // resolve(cleaned);
 
-          resolve(raw);
+          resolve(enrichedRaw);
         } catch (err: any) {
           reject(new Error(`Mcp Invocation Failed: ${err.message}`));
         }

package/src/services/user.service.ts

@@ -31,6 +31,8 @@ export class UserService extends CRUDService<User> {
     readonly entityManager: EntityManager,
     // @InjectRepository(User, 'default')
     readonly repo: UserRepository,
+    @InjectRepository(User, 'default')
+    readonly nonSecurityRuleAwareRepo : Repository<User>,
     @InjectRepository(RoleMetadata)
     private readonly roleRepository: Repository<RoleMetadata>,
     readonly moduleRef: ModuleRef,
@@ -141,7 +143,7 @@ export class UserService extends CRUDService<User> {
   }
 
   async addRolesToUser(username: string, roleNames: string[]): Promise<User> {
-    const user = await this.repo.findOne({
+    const user = await this.nonSecurityRuleAwareRepo.findOne({
       where: { username: username },
       relations: { roles: true }
     });
@@ -174,7 +176,7 @@ export class UserService extends CRUDService<User> {
       user.roles = user.roles.filter(role => !rolesToRemove.includes(role));
     }
 
-    return await this.repo.save(user);
+    return await this.nonSecurityRuleAwareRepo.save(user);
   }