@solidstarters/solid-core 1.2.178 → 1.2.180

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.178",
+  "version": "1.2.180",
   "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",
@@ -49,6 +49,7 @@
     "cache-manager-redis-store": "^3.0.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
+    "dayjs": "^1.11.18",
     "exceljs": "^4.4.0",
     "fast-csv": "^5.0.2",
     "handlebars": "^4.7.8",
@@ -69,7 +70,7 @@
     "pluralize": "^8.0.0",
     "puppeteer": "^23.2.0",
     "r2r-js": "^0.4.43",
-    "reflect-metadata": "^0.1.13",
+    "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "swagger-ui-express": "^5.0.0",
     "twilio": "^5.8.0",

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,activeUser.sub);
+    return this.service.triggerMcpClientJob(dto, activeUser.sub);
   }
 
   @ApiBearerAuth("jwt")

package/src/controllers/service.controller.ts

@@ -5,10 +5,14 @@ import { Public } from 'src/decorators/public.decorator';
 import { ErrorMapperService } from 'src/helpers/error-mapper.service';
 import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 import { AiInteractionService } from 'src/services/ai-interaction.service';
+import { IngestMetadataService } from 'src/services/genai/ingest-metadata.service';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { SolidRegistry } from '../helpers/solid-registry';
 
-
+export interface PostProcessCodeGenConfig {
+    runModuleMetadataSeeder?: boolean; // If true, regenerate module metadata
+    runSolidIngestion?: boolean; // If true, run solid ingestion command
+}
 @Controller('')
 @ApiTags("Common")
 // @UseGuards(ThrottlerGuard)
@@ -20,7 +24,9 @@ export class ServiceController {
         private readonly solidRegistry: SolidRegistry,
         private readonly aiInteractionService: AiInteractionService,
         private readonly mqMessageService: MqMessageService,
-        private readonly errorMapper: ErrorMapperService
+        private readonly errorMapper: ErrorMapperService,
+        private readonly ingestMetadataService: IngestMetadataService,
+        
     ) { }
 
     @Public()
@@ -103,6 +109,38 @@ export class ServiceController {
         return { message: `seed data for ${seedData.seeder}` };
     }
 
+    @ApiBearerAuth("jwt")
+    @Post('code-generation/post-process')
+    async postProcessCodeGeneration(@Body() config : PostProcessCodeGenConfig) {
+        // Set defaults if not provided
+        config.runModuleMetadataSeeder = config.runModuleMetadataSeeder ?? true;
+        config.runSolidIngestion = config.runSolidIngestion ?? true;
+
+        // Run the Module Metadata Seeder Service
+        if (config.runModuleMetadataSeeder) {
+            this.logger.debug(`Running the Module Metadata Seeder Service as part of post-process code generation`);
+            const seeder = this.solidRegistry
+                .getSeeders()
+                .filter((seeder) => seeder.name === 'ModuleMetadataSeederService')
+                .map((seeder) => seeder.instance)
+                .pop();
+            if (!seeder) {
+                this.logger.error(`Seeder service ModuleMetadataSeederService not found. Does your service have a seed() method?`);
+            } else {
+                await seeder.seed();
+            }
+        } else {
+            this.logger.debug(`Skipping the Module Metadata Seeder Service as part of post-process code generation`);
+        }
+        
+        // Run the Solid ingestion command
+        if (config.runSolidIngestion) {
+            this.logger.debug(`Running the Solid ingestion command as part of post-process code generation`);
+            await this.ingestMetadataService.ingest();
+        }
+    }
+
+
     // @Public()
     // @Get('play')
     // play() {

package/src/helpers/date.helper.ts

@@ -0,0 +1,13 @@
+import dayjs from 'dayjs';
+
+
+export function parseFlexibleDate(value: string): Date | null {
+    if (!value) return null;
+    const formats = ['DD-MM-YYYY', 'YYYY-MM-DD'];
+    const parsed = dayjs(value, formats, true); // true = strict parsing
+    if (!parsed.isValid()) {
+      return null;
+    }
+    return parsed.toDate();
+  }
+  

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

@@ -92,22 +92,26 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
             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
+            status: 'pending' // 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.
-        `
+# 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 json envelopes, additional formatting, commentary, or text.
+- Do not wrap the result in quotes, JSON, or markdown fences.
+- Do not explain what the result means.
+
+# Past Interactions: 
+This section contains the last 10 interactions done between the human and LLM. These are sorted by oldest first. 
+Use these interactions to further identify concerns based on the current User Prompt.
+
+`
 
         const aiResponse = await this.aiInteractionService.runMcpPrompt(finalPrompt);
         this.triggerMcpClientSubscriberLogger.log(`aiResponse: `);
@@ -116,8 +120,8 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
         if (!aiResponse.success) {
             this.triggerMcpClientSubscriberLogger.log(`Gen ai has returned with a false status code`);
 
-            const errorsStr = aiResponse.errors.join('\n ');
-            const errorTrace = aiResponse.error_trace.join('\n');
+            const errorsStr = aiResponse.errors?.join('\n ');
+            const errorTrace = aiResponse.error_trace?.join('\n');
 
             // await this.aiInteractionService.create({
             //     userId: aiInteraction.user.id,
@@ -148,7 +152,7 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
             throw new Error(errorsStr);
         }
         else {
-            // let nestedResponse = this.cleanNestedResponse(aiResponse);
+            let nestedResponse = this.cleanNestedResponse(aiResponse);
 
             // const genAiInteraction = await this.aiInteractionService.create({
             //     userId: aiInteraction.user.id,
@@ -166,14 +170,19 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
             // });
 
             // TODO: Update the previously created genAiInteraction record with the respective success fields and save to DB
+            const errorsStr = nestedResponse.status == "error" && nestedResponse.errors.join('\n ');
+
             await this.aiInteractionService.update(genAiInteraction.id, {
+                errorMessage: nestedResponse.status == "error" ? `${errorsStr}` : "",
+                // errorMessage:"",
                 // contentType: aiResponse.content_type,
-                errorMessage: '',
                 // message: nestedResponse,
                 modelUsed: aiResponse.model,
                 responseTimeMs: aiResponse.duration_ms,
                 isApplied: aiInteraction.isApplied,
-                status: aiResponse.success ? 'succeeded' : 'failed'
+
+                // status: aiResponse.success ? 'succeeded' : 'failed'
+                status: aiResponse.success && nestedResponse.status == "success" ? 'succeeded' : 'failed'
             }, [], true);
 
             // If the human interaction was with isAutoApply=true, then we can go ahead and autoApply.

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

@@ -12331,7 +12331,9 @@
                                 "type": "field",
                                 "attrs": {
                                   "name": "metadata",
-                                  "height": "80vh"
+                                  "height": "80vh",
+                                  "viewWidget":"SolidAiInteractionMetadataFieldFormWidget"
+
                                 }
                               }
                             ]

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

@@ -62,7 +62,7 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
     const m = {
       payload: {
         aiInteractionId: aiInteraction.id,
-        moduleName:dto.moduleName
+        moduleName: dto.moduleName
       },
       parentEntity: 'aiInteraction',
       parentEntityId: aiInteraction.id,
@@ -149,6 +149,7 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
           }
           catch (ex) {
             this.logger.warn(`Attempting to parse mcp client response assuming it is JSON, however it is not: ${parsedResponse}`);
+            // raw.success = false
           }
           // Parse the response string into an object
           // const parsedResponse = JSON.parse(raw.response);
@@ -203,16 +204,22 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
     }
 
     // TODO: Validation: Check if JSON.parse(metadata).tools_invoked starts with solid_
-    let metadata = {};
+    let metadata: any = {};
     try {
-      metadata = JSON.parse(aiInteraction.metadata);
-    }
-    catch (e) {
+      if (typeof aiInteraction.metadata === "string") {
+        metadata = JSON.parse(aiInteraction.metadata);
+      } else if (typeof aiInteraction.metadata === "object" && aiInteraction.metadata !== null) {
+        metadata = aiInteraction.metadata;
+      } else {
+        // optional fallback
+        metadata = {};
+      }
+    } catch (e) {
       // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....
-      throw new Error(e);
+      throw new Error(`Invalid metadata JSON: ${e}`);
     }
 
-    const toolsInvoked = metadata['tools_invoked'];
+    const toolsInvoked = metadata['toolsInvoked'];
     if (!toolsInvoked) {
       // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....
       throw new Error(ERROR_MESSAGES.UNABLE_TO_RESOLVE_SOLID_COMMAND);

package/src/services/excel.service.ts

@@ -59,7 +59,7 @@ export class ExcelService {
         //   headers.reduce((acc, header) => ({ ...acc, [header]: '' }), {})
         // ).commit(); // Write a dummy record with headers
 
-        await workbook.commit();
+         workbook.commit();
         return passThrough;
       }
 
@@ -86,7 +86,7 @@ export class ExcelService {
         this.logger.debug(`✅ Chunk ${chunkIndex} written to Excel`);
       }
 
-      await workbook.commit();
+       workbook.commit();
       // passThrough.end(); // ✅ Properly close the stream
     } catch (error) {
       this.logger.error(`❌ Error writing Excel: ${error.message}`);

package/src/services/genai/ingest-metadata.service.ts

@@ -121,7 +121,7 @@ export class IngestMetadataService {
             ingestionInfo.collectionId = collectionId;
 
             // Delete and re-insert a document representing the full json...
-            await this.deleteInsertRagDocumentForModuleMetadataJsonFile(ingestionInfo, fullPath, fileName)
+            // await this.deleteInsertRagDocumentForModuleMetadataJsonFile(ingestionInfo, fullPath, fileName)
 
             // Delete and re-insert a chunk representing the module.
             await this.deleteInsertRagChunkForModule(ingestionInfo, moduleMetadata);
@@ -129,11 +129,29 @@ export class IngestMetadataService {
             // Delete and re-insert chunks representing each model.
             for (const model of moduleMetadata.models) {
                 await this.deleteInsertRagChunkForModel(ingestionInfo, enabledModule, model);
-                for (const field of model.fields) {
-                    await this.deleteInsertRagChunkForField(ingestionInfo, enabledModule, model.singularName, field);
-                }
+
+                // Disabling this for now...
+                // for (const field of model.fields) {
+                //     await this.deleteInsertRagChunkForField(ingestionInfo, enabledModule, model.singularName, field);
+                // }
             }
 
+            // TODO: Delete and re-insert chunks representing roles
+
+            // TODO: Delete and re-insert chunks representing menus 
+
+            // TODO: Delete and re-insert chunks representing actions
+
+            // TODO: Delete and re-insert chunks representing list views 
+
+            // TODO: Delete and re-insert chunks representing kanban views 
+
+            // TODO: Delete and re-insert chunks representing form views
+
+            // TODO: Delete and re-insert chunks representing security rules
+
+            // TODO: Delete and re-insert chunks representing scheduled jobs
+
             // Save ingestion info to disk...
             fs.writeFileSync(enabledModulIngestionInfoFullPath, JSON.stringify({ ...ingestionInfo }, null, 2), 'utf8');
         }
@@ -242,7 +260,7 @@ export class IngestMetadataService {
                 description: m?.description ?? null,
 
                 // Include field names to detect field-level changes at module granularity - maybe remove this later?
-                fields: Array.isArray(m?.fields) ? m.fields.map((f: any) => f?.name ?? null) : [],
+                // fields: Array.isArray(m?.fields) ? m.fields.map((f: any) => f?.name ?? null) : [],
             })),
         });
 
@@ -270,6 +288,7 @@ Usage: Use this chunk to choose the correct model/field chunks for code generati
 
         // metadata has to be concise and queryable
         const metadata = {
+            collectionName: `${moduleName}-rag-collection`,
             kind: 'solidx-metadata',
             type: 'module',
             moduleName,
@@ -288,7 +307,8 @@ Usage: Use this chunk to choose the correct model/field chunks for code generati
         }
 
         const r = await this.ragClient.documents.create({
-            raw_text: text,
+            chunks: [text],
+            // raw_text: text,
             metadata: metadata,
             collectionIds: [ingestionInfo.collectionId],
         });
@@ -364,10 +384,15 @@ Fields (${fields.length}) [name:type|flags]:
 ${fieldSummaryLines.join('\n')}
 
 Usage: Use this chunk to generate DTOs, subscribers, custom service methods, and CRUD handlers for ${modelName}.
-For exact constraints (enum/min/max/regex/default), consult the individual field chunks.`;
+
+Full model metadata json: 
+${JSON.stringify(model)}
+
+`;
 
         // 4) Metadata (concise & queryable)
         const metadata = {
+            collectionName: `${moduleName}-rag-collection`,
             kind: 'solidx-metadata',
             type: 'model',
             moduleName,
@@ -392,7 +417,7 @@ For exact constraints (enum/min/max/regex/default), consult the individual field
 
         // 6) Create new document (R2R auto-generates the ID)
         const r = await this.ragClient.documents.create({
-            raw_text: text,
+            chunks: [text],
             metadata,
             collectionIds: [ingestionInfo.collectionId],
         });
@@ -661,6 +686,7 @@ For exact constraints (enum/min/max/regex/default), consult the individual field
 
         // 4) Build text + metadata tailored to FieldMetadata
         const { text, metadata } = this._buildFieldTextAndMetadata(moduleName, modelName, field);
+
         // also keep the hash in metadata for audit/debug
         (metadata as any).schemaHash = schemaHash;
 

package/src/services/import-transaction.service.ts

@@ -26,6 +26,7 @@ import { CsvService } from './csv.service';
 import { ExcelService } from './excel.service';
 import { SolidIntrospectService } from './solid-introspect.service';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
+import { parseFlexibleDate } from 'src/helpers/date.helper';
 
 interface ImportTemplateFileInfo {
   stream: NodeJS.ReadableStream;
@@ -566,10 +567,11 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
     // TODO Move this logic to field crud managers i.e add a parse method to the field crud manager interface
     switch (fieldType) {
       case SolidFieldType.relation: {
-        return await this.populateDtoForRelations(fieldMetadata, record, key, dtoRecord);
+        return await this.populateDtoForRelations(fieldMetadata, record, key, dtoRecord); 
       }
       case SolidFieldType.date:
-      case SolidFieldType.datetime: return this.populateDtoForDate(record, key, fieldMetadata, dtoRecord);
+      case SolidFieldType.datetime:
+         return this.populateDtoForDate(record, key, fieldMetadata, dtoRecord);
       case SolidFieldType.int:
       case SolidFieldType.bigint:
       case SolidFieldType.decimal:
@@ -579,16 +581,24 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
       case SolidFieldType.selectionStatic:
       case SolidFieldType.selectionDynamic:
         return this.populateDtoForSelectionValues(dtoRecord, fieldMetadata, record, key);
-      default:
+      case SolidFieldType.email:
+      case SolidFieldType.shortText:
+      case SolidFieldType.longtext:
+      case SolidFieldType.richText: {
+        dtoRecord[fieldMetadata.name] = record[key] ? String(record[key]).trim() : null; // Trim text fields and set to null if empty
+        return dtoRecord;
+      }
+      default: {
         dtoRecord[fieldMetadata.name] = record[key];
         return dtoRecord;
+      }
     }
   }
   
   private populateDtoForSelectionValues(dtoRecord: Record<string, any>, fieldMetadata: FieldMetadata, record: Record<string, any>, key: string) {
     const rawValue = record[key];
 
-    if (rawValue == null) {
+    if (rawValue == null || rawValue === '' || (typeof rawValue === 'string' && rawValue.trim() === '')) {
       dtoRecord[fieldMetadata.name] = null;
       return dtoRecord;
     }
@@ -611,16 +621,28 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
 
 
   private populateDtoForBoolean(dtoRecord: Record<string, any>, fieldMetadata: FieldMetadata, record: Record<string, any>, key: string) {
-    const booleanValue = Boolean(record[key]);
-    if (typeof booleanValue !== 'boolean') {
-      throw new Error(`Invalid boolean value for cell ${key} with value ${record[key]}`);
+    const cellValue = record[key];
+    if (cellValue === null || cellValue === undefined || cellValue === '') {
+      dtoRecord[fieldMetadata.name] = null; // If the cell is empty, set the field to null
+      return dtoRecord;
+    }
+
+    // If the cell contains values other than 'true', '1', 'yes', 'false', '0', 'no', throw an error
+    const booleanValue = (String(cellValue).toLowerCase() === 'true' || String(cellValue) === '1' || String(cellValue).toLowerCase() === 'yes') ? true : (String(cellValue).toLowerCase() === 'false' || String(cellValue) === '0' || String(cellValue).toLowerCase() === 'no') ? false : null;
+    if (booleanValue === null) {
+      throw new Error(`Invalid boolean value for cell ${key} with value ${cellValue}`);
     }
     dtoRecord[fieldMetadata.name] = booleanValue;
     return dtoRecord;
   }
 
   private populateDtoForNumber(dtoRecord: Record<string, any>, fieldMetadata: FieldMetadata, record: Record<string, any>, key: string) {
-    const numberValue = Number(record[key]);
+    const cellValue = record[key];
+    if (cellValue === null || cellValue === undefined || cellValue === '') {
+      dtoRecord[fieldMetadata.name] = null; // If the cell is empty, set the field to null
+      return dtoRecord;
+    }
+    const numberValue = Number(cellValue);
     if (isNaN(numberValue)) {
       throw new Error(`Invalid number value for cell ${key} with value ${record[key]}`);
     }
@@ -630,10 +652,23 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
 
   private populateDtoForDate(record: Record<string, any>, key: string, fieldMetadata: FieldMetadata, dtoRecord: Record<string, any>) {
     {
-      const dateValue = new Date(record[key]);
-      if (isNaN(dateValue.getTime())) {
-        throw new Error(`Invalid date value for cell ${key} with value ${record[key]}`);
+      // Get the cell value
+      const cellValue = record[key];
+      if (!cellValue) { //If cell is a falsy value (empty)
+        dtoRecord[fieldMetadata.name] = null; // If the cell is empty, set the field to null
+        return dtoRecord;
       }
+     // Use flexible date parser
+     console.log(cellValue,'cellValue');
+     
+  const dateValue = parseFlexibleDate(cellValue);
+  console.log(dateValue,'dateValue');
+
+  if (!dateValue) {
+    throw new Error(
+      `Invalid date value for cell ${key} with value ${cellValue}`
+    );
+  }
       dtoRecord[fieldMetadata.name] = dateValue;
       return dtoRecord;
     }

package/src/services/mcp-tool-response-handlers/solid-create-model-with-fields-mcp-tool-response-handler.service.ts

@@ -5,6 +5,7 @@ import { SolidRegistry } from "src/helpers/solid-registry";
 import { ModelMetadataService } from "../model-metadata.service";
 import { CreateModelMetadataDto } from "src/dtos/create-model-metadata.dto";
 import { ModuleMetadataService } from "../module-metadata.service";
+import { model } from "mongoose";
 
 @Injectable()
 export class SolidCreateModelWithFieldsMcpToolResponseHandler implements IMcpToolResponseHandler {
@@ -19,9 +20,9 @@ export class SolidCreateModelWithFieldsMcpToolResponseHandler implements IMcpToo
     async apply(aiInteraction: AiInteraction) {
         // const aiResponse = JSON.parse(aiInteraction.message);
         const escapedMessage = aiInteraction.message.replace(/\\'/g, "'");
-        const aiResponse = JSON.parse(escapedMessage);
+        const aiResponseMessage = JSON.parse(escapedMessage);
 
-        const { moduleUserKey, modelSchema } = aiResponse;
+        const { moduleUserKey, ...modelSchema } = aiResponseMessage;
         const moduleMetadata = await this.moduleMetadataService.findOneByUserKey(moduleUserKey);
         if (!moduleMetadata) {
             throw new Error(`Module with user key ${moduleUserKey} not found.`);

package/src/services/mcp-tool-response-handlers/solid-create-module-mcp-tool-response-handler.service.ts

@@ -16,9 +16,9 @@ export class SolidCreateModuleMcpToolResponseHandler implements IMcpToolResponse
     }
 
     async apply(aiInteraction: AiInteraction) {
-        const aiResponse = JSON.parse(aiInteraction.message);
+        const aiResponseMessage = JSON.parse(aiInteraction.message);
 
-        const moduleMetadata = aiResponse?.data?.moduleMetadata ?? {};
+        const moduleMetadata = aiResponseMessage?.moduleMetadata ?? {};
 
         // TODO: Validate if another module with same name exists, if it does then raise an error...