@solidstarters/solid-core 1.2.178 → 1.2.179

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.178",
+  "version": "1.2.179",
   "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,activeUser.sub);
+    return this.service.triggerMcpClientJob(dto, activeUser.sub);
   }
 
   @ApiBearerAuth("jwt")

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

@@ -92,7 +92,7 @@ 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 = `
@@ -148,7 +148,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 +166,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

@@ -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);

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

@@ -566,10 +566,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 +580,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 +620,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,7 +651,13 @@ 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]);
+      // 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;
+      }
+      const dateValue = new Date(cellValue);
       if (isNaN(dateValue.getTime())) {
         throw new Error(`Invalid date value for cell ${key} with value ${record[key]}`);
       }