@solidstarters/solid-core 1.2.161 → 1.2.163

package/src/services/genai/r2r-helper.service.ts

@@ -0,0 +1,33 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { r2rClient } from 'r2r-js';
+
+
+
+@Injectable()
+export class R2RHelperService {
+    private readonly logger = new Logger(R2RHelperService.name);
+
+    constructor() { }
+
+    async getClient() {
+        this.logger.debug(`Attempting to create RAG client with url: ${process.env.GENAI_RAG_SERVER_URL}`);
+        const client = new r2rClient(process.env.GENAI_RAG_SERVER_URL);
+
+        // @ts-ignore
+        this.logger.debug(`Attempting to login to our RAG server with user ${process.env.GENAI_RAG_SERVER_LOGIN}`)
+        await client.users.login({
+            email: process.env.GENAI_RAG_SERVER_LOGIN,
+            password: process.env.GENAI_RAG_SERVER_PASSWORD
+        });
+
+        return client;
+    }
+
+    // async checkHealth() {
+    //     const client = new r2rClient('http://localhost:7272');
+
+    //     return await client.health();
+    // }
+
+}

package/src/services/setting.service.ts

@@ -73,6 +73,10 @@ export class SettingService extends CRUDService<Setting> {
       authScreenRightBackgroundImage: null,
       authScreenLeftBackgroundImage: null,
       authScreenCenterBackgroundImage: null,
+      solidXGenAiCodeBuilderConfig: JSON.stringify({
+            defaultProvider: "",
+            availableProviders: []
+        })
     };
 
     const existingSettings = await this.repo.find();
@@ -106,21 +110,34 @@ export class SettingService extends CRUDService<Setting> {
     for (const setting of settingsArray) {
       if (setting.key && setting.value !== undefined && setting.value !== null) {
         let value = setting.value;
-
-        if (value === 'true' || value === 'false') {
-          settingsMap[setting.key] = value === 'true';
-        }
-        else if (!isNaN(Number(value)) && value.trim() !== '') {
-          settingsMap[setting.key] = Number(value);
-        }
-        else if (value.includes(',')) {
-          settingsMap[setting.key] = value.split(',').map(item => item.trim());
-        }
-        else {
-          settingsMap[setting.key] = value;
+                try {
+          settingsMap[setting.key] = JSON.parse(value);
+        } catch {
+          if (value === 'true' || value === 'false') {
+            settingsMap[setting.key] = value === 'true';
+          } else if (!isNaN(Number(value)) && value.trim() !== '') {
+            settingsMap[setting.key] = Number(value);
+          } else if (value.includes(',')) {
+            settingsMap[setting.key] = value.split(',').map(item => item.trim());
+          } else {
+            settingsMap[setting.key] = value;
+          }
         }
+
+        // if (value === 'true' || value === 'false') {
+        //   settingsMap[setting.key] = value === 'true';
+        // }
+        // else if (!isNaN(Number(value)) && value.trim() !== '') {
+        //   settingsMap[setting.key] = Number(value);
+        // }
+        // else if (value.includes(',')) {
+        //   settingsMap[setting.key] = value.split(',').map(item => item.trim());
+        // }
+        // else {
+        //   settingsMap[setting.key] = value;
+        // }
       }
-    }
+    } 
 
     const defaultSettings = this.getDefaultSettings();
 
@@ -166,6 +183,10 @@ export class SettingService extends CRUDService<Setting> {
       authScreenRightBackgroundImage: null,
       authScreenLeftBackgroundImage: null,
       authScreenCenterBackgroundImage: null,
+      solidXGenAiCodeBuilderConfig: JSON.stringify({
+            defaultProvider: "",
+            availableProviders: []
+        })
     };
   }
 
@@ -303,16 +324,19 @@ export class SettingService extends CRUDService<Setting> {
         const value = setting.value;
         let parsedValue: any;
 
-        if (value === 'true' || value === 'false') {
-          parsedValue = value === 'true';
-        } else if (!isNaN(Number(value)) && value.trim() !== '') {
-          parsedValue = Number(value);
-        } else if (value.includes(',')) {
-          parsedValue = value.split(',').map(item => item.trim());
-        } else {
-          parsedValue = value;
+        try {
+          parsedValue = JSON.parse(value);
+        } catch {
+          if (value === 'true' || value === 'false') {
+            parsedValue = value === 'true';
+          } else if (!isNaN(Number(value)) && value.trim() !== '') {
+            parsedValue = Number(value);
+          } else if (value.includes(',')) {
+            parsedValue = value.split(',').map(item => item.trim());
+          } else {
+            parsedValue = value;
+          }
         }
-
         if (setting.type === 'user') {
           user[setting.key] = parsedValue;
         } else {

package/src/solid-core.module.ts

@@ -284,6 +284,10 @@ import { Three60WhatsappService } from './services/whatsapp/Three60WhatsappServi
 import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis/src/throttler-storage-redis.service';
 import { isRedisConfigured } from './helpers/environment.helper';
 import { UserRepository } from './repository/user.repository';
+import { ErrorMapperService } from './helpers/error-mapper.service';
+import { IngestCommand } from './commands/ingest.command';
+import { R2RHelperService } from './services/genai/r2r-helper.service';
+import { IngestMetadataService } from './services/genai/ingest-metadata.service';
 
 
 @Global()
@@ -447,6 +451,7 @@ import { UserRepository } from './repository/user.repository';
     RefreshModuleCommand,
     SolidIntrospectService,
     DiscoveryService,
+    R2RHelperService,
     CrudHelperService,
     CRUDService,
     Reflector,
@@ -470,6 +475,8 @@ import { UserRepository } from './repository/user.repository';
     TextractService,
     SolidRegistry,
     SeedCommand,
+    IngestCommand,
+    IngestMetadataService,
     SMTPEMailService,
     ElasticEmailService,
     Msg91SMSService,
@@ -480,6 +487,7 @@ import { UserRepository } from './repository/user.repository';
     EmailTemplateService,
     PublisherFactory,
     PollerService,
+    ErrorMapperService,
 
     McpToolResponseHandlerFactory,
     SolidCreateModuleMcpToolResponseHandler,