@solidstarters/solid-core 1.2.148 → 1.2.150

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.148",
+  "version": "1.2.150",
   "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/dtos/create-ai-interaction.dto.ts

@@ -48,9 +48,20 @@ export class CreateAiInteractionDto {
     @IsJSON()
     @ApiProperty()
     metadata: any;
-
-@IsOptional()
-@IsBoolean()
-@ApiProperty()
-isApplied: boolean = false;
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    isApplied: boolean = false;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    parentInteractionId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    parentInteractionUserKey: string;
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    isAutoApply: boolean = false;
 }

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

@@ -52,9 +52,20 @@ export class UpdateAiInteractionDto {
     @IsJSON()
     @ApiProperty()
     metadata: any;
-
-@IsOptional()
-@IsBoolean()
-@ApiProperty()
-isApplied: boolean;
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    isApplied: boolean;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    parentInteractionId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    parentInteractionUserKey: string;
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    isAutoApply: boolean;
 }

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

@@ -28,7 +28,15 @@ export class AiInteraction extends CommonEntity {
     responseTimeMs: number;
     @Column({ type: "jsonb", nullable: true })
     metadata: any;
-
-@Column({ type: "boolean", nullable: true, default: false })
-isApplied: boolean = false;
+    @Column({ type: "boolean", nullable: true, default: false })
+    isApplied: boolean = false;
+    @Index()
+    @ManyToOne(() => AiInteraction, { onDelete: "SET NULL", nullable: true })
+    @JoinColumn()
+    parentInteraction: AiInteraction;
+    @Index({ unique: true })
+    @Column({ type: "varchar" })
+    externalId: string;
+    @Column({ type: "boolean", nullable: true, default: false })
+    isAutoApply: boolean = false;
 }

package/src/helpers/environment.helper.ts

@@ -0,0 +1,7 @@
+export function parseBooleanEnv(key: string, defaultValue: boolean = false): boolean {
+    const value = process.env[key];
+    if (value === undefined) {
+        return defaultValue;
+    }
+    return value.toLowerCase() === 'true';
+}

package/src/index.ts

@@ -166,6 +166,8 @@ export * from './helpers/field-crud-managers/SelectionDynamicFieldCrudManager' /
 export * from './helpers/field-crud-managers/SelectionStaticFieldCrudManager' //rename
 export * from './helpers/field-crud-managers/ShortTextFieldCrudManager' //rename
 export * from './helpers/field-crud-managers/UUIDFieldCrudManager' //rename
+export * from './helpers/environment.helper'
+
 export * from './services/crud.service'
 export * from './interceptors/logging.interceptor'
 export * from './interceptors/wrap-response.interceptor'
@@ -264,6 +266,7 @@ export * from './services/csv.service'
 export * from './services/queues/publisher-factory.service'
 export * from './services/queues/database-publisher.service'
 export * from './services/queues/database-subscriber.service'
+export * from './services/ai-interaction.service'
 
 // Factories
 export * from './factories/mail.factory'

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

@@ -58,6 +58,7 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
             await this.aiInteractionService.create({
                 userId: aiInteraction.user.id,
                 threadId: aiInteraction.threadId,
+                parentInteractionId: aiInteraction.id,
                 role: 'gen-ai',
                 message: '-',
                 contentType: aiResponse.content_type,
@@ -77,6 +78,7 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
             await this.aiInteractionService.create({
                 userId: aiInteraction.user.id,
                 threadId: aiInteraction.threadId,
+                parentInteractionId: aiInteraction.id,
                 role: 'gen-ai',
                 message: nestedResponse,
                 contentType: aiResponse.content_type,

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

@@ -4919,7 +4919,7 @@
         "tableName": "ss_ai_interactions",
         "dataSource": "default",
         "dataSourceType": "postgres",
-        "userKeyFieldUserKey": "message",
+        "userKeyFieldUserKey": "externalId",
         "isSystem": false,
         "fields": [
           {
@@ -4938,6 +4938,35 @@
             "relationModelModuleName": "solid-core",
             "isSystem": true
           },
+          {
+            "name": "externalId",
+            "displayName": "External ID",
+            "description": "Used to track using a reference number of each ai interaction.",
+            "type": "computed",
+            "ormType": "varchar",
+            "isSystem": false,
+            "computedFieldValueType": "string",
+            "computedFieldTriggerConfig": [
+              {
+                "modelName": "aiInteraction",
+                "moduleName": "solid-core",
+                "operations": [
+                  "before-insert"
+                ]
+              }
+            ],
+            "computedFieldValueProvider": "AlphaNumExternalIdComputationProvider",
+            "computedFieldValueProviderCtxt": "{\n  \"prefix\": \"AI\",\n  \"length\": \"10\"\n}",
+            "required": true,
+            "unique": true,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "isUserKey": true
+          },
           {
             "name": "threadId",
             "displayName": "Thread ID",
@@ -4950,6 +4979,22 @@
             "private": false,
             "encrypt": false
           },
+          {
+            "name": "parentInteraction",
+            "displayName": "Parent Interaction",
+            "type": "relation",
+            "required": false,
+            "unique": false,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "relationType": "many-to-one",
+            "relationCoModelSingularName": "aiInteraction",
+            "relationCreateInverse": false,
+            "relationCascade": "set null",
+            "relationModelModuleName": "solid-core",
+            "isSystem": true
+          },
           {
             "name": "role",
             "displayName": "Role",
@@ -5057,6 +5102,17 @@
             "index": false,
             "private": false,
             "encrypt": false
+          },
+          {
+            "name": "isAutoApply",
+            "displayName": "Is Auto Apply",
+            "type": "boolean",
+            "ormType": "boolean",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false
           }
         ]
       }
@@ -11867,7 +11923,7 @@
       }
     },
     {
-      "name": "ai-interaction-list-view",
+      "name": "aiInteraction-list-view",
       "displayName": "AI Interaction",
       "type": "list",
       "context": "{}",
@@ -11900,6 +11956,18 @@
               "name": "threadId"
             }
           },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "externalId"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "parentInteraction"
+            }
+          },
           {
             "type": "field",
             "attrs": {
@@ -11934,7 +12002,7 @@
       }
     },
     {
-      "name": "ai-interaction-form-view",
+      "name": "aiInteraction-form-view",
       "displayName": "AI Interaction",
       "type": "form",
       "context": "{}",
@@ -11987,6 +12055,12 @@
                                   "name": "user"
                                 }
                               },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "externalId"
+                                }
+                              },
                               {
                                 "type": "field",
                                 "attrs": {
@@ -12034,6 +12108,12 @@
                                 "attrs": {
                                   "name": "responseTimeMs"
                                 }
+                              },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "parentInteraction"
+                                }
                               }
                             ]
                           }

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

@@ -43,7 +43,7 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
     super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);
   }
 
-  async triggerMcpClientJob(prompt: string): Promise<string> {
+  async triggerMcpClientJob(prompt: string): Promise<any> {
     const activeUser: ActiveUserData = this.requestContextService.getActiveUser();
 
     const aiInteraction = await this.create({
@@ -65,7 +65,12 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
       parentEntityId: aiInteraction.id,
     };
 
-    return await this.publisherFactory.publish(m, 'TriggerMcpClientPublisher');
+    const queueMessageId = await this.publisherFactory.publish(m, 'TriggerMcpClientPublisher');
+
+    return {
+      queueMessageId: queueMessageId,
+      aiInteractionId: aiInteraction.id
+    }
   }
 
   /**
@@ -206,7 +211,7 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
 
     // TODO: This provider to implement an interface - IMcpToolResponseHandler ... apply(aiInteraction: AiInteraction)
     // throw new Error('Method not implemented.');
-    
+
     // Mark the interaction as applied
     await this.update(aiInteraction.id, { isApplied: true }, [], true);
 

package/src/services/media.service.ts

@@ -84,7 +84,6 @@ export class MediaService extends CRUDService<Media> {
     const savedMedias = [];
     for (let i = 0; i < files.length; i++) {
 
-
       createDto['fieldMetadata'] = await this.fieldMetadataRepo.findOne({
         where: {
           id: createDto['fieldMetadataId']
@@ -113,9 +112,9 @@ export class MediaService extends CRUDService<Media> {
           const fileName = this.getFileName(file);
           let awsFileUrl;
           if (createDto.mediaStorageProviderMetadata.isPublic === true) {
-            awsFileUrl = await this.fileService.copyToS3(file.path, file.mimetype, fileName, createDto.mediaStorageProviderMetadata.bucketName,);
-          } else {
             awsFileUrl = await this.fileService.copyToS3WithPublic(file.path, file.mimetype, fileName, createDto.mediaStorageProviderMetadata.bucketName,);
+          } else {
+            awsFileUrl = await this.fileService.copyToS3(file.path, file.mimetype, fileName, createDto.mediaStorageProviderMetadata.bucketName,);
           }
           // createDto['relativeUri'] = this.getAwsS3FullFilePath(awsFileUrl, createDto.mediaStorageProviderMetadata.bucketName, createDto.mediaStorageProviderMetadata.region);
           createDto['relativeUri'] = awsFileUrl

package/src/services/mediaStorageProviders/file-s3-storage-provider.ts

@@ -60,7 +60,7 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
             throw new Error("Entity must be an instance of CommonEntity"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity
         }
         const result: Media[] = [];
-        files.forEach(async (file) => {
+        for (const file of files) {
             const fileName = this.getFileName(file);
             // Store the file in the configured S3 Bucket
             let awsFileUrl;
@@ -84,7 +84,7 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
             }) as unknown as Media;
             result.push(mediaEntity);
             this.logger.debug(`Stored media with`, mediaEntity);
-        });
+        };
         return result;
     }
 

package/src/services/mediaStorageProviders/file-storage-provider.ts

@@ -38,7 +38,7 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
             throw new Error("Entity must be an instance of CommonEntity"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity
         }
         const result: Media[] = [];
-        files.forEach(async (file) => {
+        for (const file of files) {
             // Store the file in the configured file storage directory
             const fileStoragePath = this.getFullFilePath(this.getFileName(file));
             await this.fileService.copyFile(file.path, fileStoragePath);
@@ -57,7 +57,7 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
             }) as unknown as Media;
             result.push(mediaEntity);
             this.logger.debug(`Stored media with`, mediaEntity);
-        });
+        };
         return result;
     }
 
@@ -66,7 +66,7 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
             throw new Error("Entity must be an instance of CommonEntity"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity
         }
         const result: Media[] = [];
-        streamPairs.forEach(async (pair) => {
+        for (const pair of streamPairs) {
             const stream = pair[0];
             const fileName = pair[1];
             this.fileService.writeStreamToFile(stream, this.getFullFilePath(fileName));
@@ -78,7 +78,7 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
                 fieldMetadataId: mediaFieldMetadata.id
             }) as unknown as Media;
             this.logger.debug(`Stored media with`, mediaEntity);
-        });
+        };
         return result;
     }
 

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

@@ -68,4 +68,120 @@ export class MqMessageService extends CRUDService<MqMessage> {
     });
   }
 
+/**
+ * Wait until a queue message reaches a terminal status (succeeded/failed).
+ *
+ * @param messageId string – the external message id you store in `ss_mq_message.messageId`
+ * @param opts.timeoutMs total time to wait before giving up (default 60s)
+ * @param opts.intervalMs initial poll interval (default 500ms)
+ * @param opts.maxIntervalMs cap for exponential backoff (default 2000ms)
+ * @param opts.throwOnFailure if true, throws when stage === 'failed' (default false)
+ * @param opts.parseJson try JSON.parse on `output` and `error` (default true)
+ * @returns resolves with the final MqMessage row when terminal, rejects on timeout (or failure if throwOnFailure)
+ */
+  async waitForTerminalStatus(
+    messageId: string,
+    opts?: {
+      timeoutMs?: number;
+      intervalMs?: number;
+      maxIntervalMs?: number;
+      throwOnFailure?: boolean;
+      parseJson?: boolean;
+      logEveryN?: number;
+    },
+  ): Promise<MqMessage> {
+    const {
+      timeoutMs = 60_000,
+      intervalMs = 500,
+      maxIntervalMs = 2_000,
+      throwOnFailure = false,
+      parseJson = true,
+      logEveryN = 10, // log every N polls to avoid noisy logs
+    } = opts || {};
+
+    const start = Date.now();
+    let attempt = 0;
+    let delay = intervalMs;
+
+    // Small helper
+    const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));
+
+    while (true) {
+      attempt++;
+
+      // Fetch minimal columns needed for quick polling
+      const rec = await this.repo.findOne({
+        where: { messageId },
+        select: {
+          id: true,
+          messageId: true,
+          stage: true,
+          finishedAt: true,
+          elapsedMillis: true,
+          output: true,
+          error: true,
+          input: true,
+          // add other fields if you need to return them
+        } as any,
+        loadEagerRelations: false,
+      });
+
+      if (attempt % logEveryN === 0) {
+        this.logger.debug(
+          `waitForTerminalStatus(${messageId}) poll #${attempt} -> ${rec?.stage ?? 'not_found'}`
+        );
+      }
+
+      if (!rec) {
+        // Not found yet – keep waiting until timeout
+      } else if (rec.stage === 'succeeded' || rec.stage === 'failed') {
+        // Optionally parse output/error if they contain JSON strings
+        if (parseJson) {
+          rec.output = this.safeJsonParse(rec.output);
+          rec.error = this.safeJsonParse(rec.error);
+        }
+
+        if (rec.stage === 'failed' && throwOnFailure) {
+          throw new Error(
+            `Queue message ${messageId} failed` +
+            (rec.error ? `: ${JSON.stringify(rec.error).slice(0, 500)}` : '')
+          );
+        }
+        return rec;
+      }
+
+      // Timeout?
+      const elapsed = Date.now() - start;
+      if (elapsed >= timeoutMs) {
+        throw new Error(`Timed out after ${timeoutMs}ms waiting for message ${messageId} to reach terminal status`);
+      }
+
+      // Backoff with cap
+      await sleep(delay);
+      delay = Math.min(Math.floor(delay * 1.5), maxIntervalMs);
+    }
+  }
+
+  // /**
+  //  * Optional wrapper: publish and then wait (if your publisher returns the messageId).
+  //  */
+  // async publishAndWait<T>(
+  //   publishFn: () => Promise<string>, // returns messageId
+  //   waitOpts?: Parameters<MqMessageService['waitForTerminalStatus']>[1],
+  // ): Promise<MqMessage> {
+  //   const messageId = await publishFn();
+  //   return this.waitForTerminalStatus(messageId, waitOpts);
+  // }
+
+  private safeJsonParse(value: unknown): unknown {
+    if (value == null) return value;
+    if (typeof value !== 'string') return value;
+    const s = value.trim();
+    if (!s) return s;
+    try {
+      return JSON.parse(s);
+    } catch {
+      return value; // leave as-is if not valid JSON
+    }
+  }
 }

package/src/services/poller.service.ts

@@ -43,7 +43,7 @@ export class PollerService implements OnModuleDestroy, BeforeApplicationShutdown
         const opts: Required<PollOptions> = {
             baseDelayMs: options.baseDelayMs ?? 1000,
             maxDelayMs: options.maxDelayMs ?? 30_000,
-            timeoutPerIterationMs: options.timeoutPerIterationMs ?? 60_000,
+            timeoutPerIterationMs: options.timeoutPerIterationMs ?? 5 * 60_000,
             jitter: options.jitter ?? true,
         };
 

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

@@ -108,7 +108,7 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
             this.poller.start(queueName, (q) => this.processNext(q), {
                 baseDelayMs: 1000,
                 maxDelayMs: 30_000,
-                timeoutPerIterationMs: 60_000,
+                timeoutPerIterationMs: 5 * 60_000,
                 jitter: true,
             });
 

package/src/solid-core.module.ts

@@ -604,7 +604,8 @@ import { PollerService } from './services/poller.service';
     ConfigModule,
     PublisherFactory,
     MailFactory,
-    PollerService
+    PollerService,
+    AiInteractionService,
   ],
 })
 export class SolidCoreModule { }