@smythos/sre 1.5.71 → 1.5.73

package/dist/types/subsystems/LLMManager/ModelsProvider.service/connectors/JSONModelsProvider.class.d.ts

@@ -26,6 +26,7 @@ export declare class JSONModelsProvider extends ModelsProviderConnector {
     private models;
     constructor(_settings?: SmythModelsProviderConfig);
     start(): Promise<void>;
+    private findModelsFolder;
     addModels(acRequest: AccessRequest, models: TLLMModelsList): Promise<void>;
     getModels(acRequest: AccessRequest): Promise<any>;
     getResourceACL(resourceId: string, candidate: IAccessCandidate): Promise<ACL>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smythos/sre",
-  "version": "1.5.71",
+  "version": "1.5.73",
   "description": "Smyth Runtime Environment",
   "author": "Alaa-eddine KADDOURI",
   "license": "MIT",

package/src/subsystems/LLMManager/ModelsProvider.service/connectors/JSONModelsProvider.class.ts

@@ -14,6 +14,7 @@ import chokidar from 'chokidar';
 import fs from 'fs/promises';
 import fsSync from 'fs';
 import path from 'path';
+import { findSmythPath } from '@sre/helpers/Sysconfig.helper';
 
 const console = Logger('SmythModelsProvider');
 
@@ -46,19 +47,34 @@ export class JSONModelsProvider extends ModelsProviderConnector {
 
         this.models = JSON.parse(JSON.stringify(models));
         if (typeof this._settings.models === 'string') {
-            this.initDirWatcher(this._settings.models);
+            this.initDirWatcher(this._settings.models); //this.started will be set to true when the watcher is ready
         } else if (typeof this._settings.models === 'object') {
             if (this._settings.mode === 'merge') this.models = { ...this.models, ...(this._settings.models as TLLMModelsList) };
             else this.models = this._settings.models as TLLMModelsList;
             this.started = true;
         } else {
-            this.started = true;
+            const modelsFolder = this.findModelsFolder();
+            if (modelsFolder) {
+                this._settings.mode === 'merge'; //Force merge mode if using models from .smyth folder
+                this.initDirWatcher(modelsFolder); //this.started will be set to true when the watcher is ready
+            }
         }
     }
     public async start() {
         super.start();
     }
 
+    private findModelsFolder() {
+        const _modelsFolder = findSmythPath('models');
+
+        if (fsSync.existsSync(_modelsFolder)) {
+            console.warn('Using default models folder  : ', _modelsFolder);
+            return _modelsFolder;
+        }
+
+        return null;
+    }
+
     @SecureConnector.AccessControl
     public async addModels(acRequest: AccessRequest, models: TLLMModelsList): Promise<void> {
         await this.ready();