@smythos/sre 1.5.8 → 1.5.9

package/dist/types/index.d.ts

@@ -159,7 +159,7 @@ export * from './subsystems/LLMManager/LLM.service/connectors/Groq.class';
 export * from './subsystems/LLMManager/LLM.service/connectors/OpenAI.class';
 export * from './subsystems/LLMManager/LLM.service/connectors/Perplexity.class';
 export * from './subsystems/LLMManager/LLM.service/connectors/VertexAI.class';
-export * from './subsystems/LLMManager/ModelsProvider.service/connectors/SmythModelsProvider.class';
+export * from './subsystems/LLMManager/ModelsProvider.service/connectors/JSONModelsProvider.class';
 export * from './subsystems/MemoryManager/Cache.service/connectors/LocalStorageCache.class';
 export * from './subsystems/MemoryManager/Cache.service/connectors/RAMCache.class';
 export * from './subsystems/MemoryManager/Cache.service/connectors/RedisCache.class';

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

@@ -0,0 +1,39 @@
+import { AccessRequest } from '@sre/Security/AccessControl/AccessRequest.class';
+import { ModelsProviderConnector } from '../ModelsProviderConnector';
+import { IAccessCandidate } from '@sre/types/ACL.types';
+import { ACL } from '@sre/Security/AccessControl/ACL.class';
+import { TLLMModelsList } from '@sre/types/LLM.types';
+type SmythModelsProviderConfig = {
+    /**
+     * The models to be used.
+     *
+     * If a string is provided, it will be used as the directory name to load the models from.
+     * If a TLLMModelsList is provided, it will be used as the models to be used.
+     *
+     */
+    models?: string | TLLMModelsList;
+    /**
+     * The mode to be used.
+     *
+     * If 'append' is used, the models will be appended to the existing models.
+     * If 'replace' is used, the existing models will be replaced with the new models.
+     */
+    mode?: 'merge' | 'replace';
+};
+export declare class JSONModelsProvider extends ModelsProviderConnector {
+    protected _settings?: SmythModelsProviderConfig;
+    name: string;
+    private models;
+    constructor(_settings?: SmythModelsProviderConfig);
+    start(): Promise<void>;
+    addModels(acRequest: AccessRequest, models: TLLMModelsList): Promise<void>;
+    getModels(acRequest: AccessRequest): Promise<any>;
+    getResourceACL(resourceId: string, candidate: IAccessCandidate): Promise<ACL>;
+    private reindexModels;
+    private scanDirectoryForModels;
+    private getValidModels;
+    private isValidSingleModel;
+    private isValidModel;
+    private initDirWatcher;
+}
+export {};

package/package.json

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

package/src/Core/SmythRuntime.class.ts

@@ -42,7 +42,7 @@ export class SmythRuntime {
             Connector: 'RAMVec',
         },
         ModelsProvider: {
-            Connector: 'SmythModelsProvider',
+            Connector: 'JSONModelsProvider',
         },
         AgentData: {
             Connector: 'NullAgentData',

package/src/index.ts

@@ -165,7 +165,7 @@ export * from './subsystems/LLMManager/LLM.service/connectors/Groq.class';
 export * from './subsystems/LLMManager/LLM.service/connectors/OpenAI.class';
 export * from './subsystems/LLMManager/LLM.service/connectors/Perplexity.class';
 export * from './subsystems/LLMManager/LLM.service/connectors/VertexAI.class';
-export * from './subsystems/LLMManager/ModelsProvider.service/connectors/SmythModelsProvider.class';
+export * from './subsystems/LLMManager/ModelsProvider.service/connectors/JSONModelsProvider.class';
 export * from './subsystems/MemoryManager/Cache.service/connectors/LocalStorageCache.class';
 export * from './subsystems/MemoryManager/Cache.service/connectors/RAMCache.class';
 export * from './subsystems/MemoryManager/Cache.service/connectors/RedisCache.class';

package/src/index.ts.bak

@@ -165,7 +165,7 @@ export * from './subsystems/LLMManager/LLM.service/connectors/Groq.class';
 export * from './subsystems/LLMManager/LLM.service/connectors/OpenAI.class';
 export * from './subsystems/LLMManager/LLM.service/connectors/Perplexity.class';
 export * from './subsystems/LLMManager/LLM.service/connectors/VertexAI.class';
-export * from './subsystems/LLMManager/ModelsProvider.service/connectors/SmythModelsProvider.class';
+export * from './subsystems/LLMManager/ModelsProvider.service/connectors/JSONModelsProvider.class';
 export * from './subsystems/MemoryManager/Cache.service/connectors/LocalStorageCache.class';
 export * from './subsystems/MemoryManager/Cache.service/connectors/RAMCache.class';
 export * from './subsystems/MemoryManager/Cache.service/connectors/RedisCache.class';

package/src/subsystems/LLMManager/ModelsProvider.service/connectors/{SmythModelsProvider.class.ts → JSONModelsProvider.class.ts}

@@ -12,6 +12,7 @@ import { Logger } from '@sre/helpers/Log.helper';
 import { debounce } from '@sre/utils/general.utils';
 import chokidar from 'chokidar';
 import fs from 'fs/promises';
+import fsSync from 'fs';
 import path from 'path';
 
 const console = Logger('SmythModelsProvider');
@@ -35,8 +36,8 @@ type SmythModelsProviderConfig = {
     mode?: 'merge' | 'replace';
 };
 
-export class SmythModelsProvider extends ModelsProviderConnector {
-    public name = 'SmythModelsProvider';
+export class JSONModelsProvider extends ModelsProviderConnector {
+    public name = 'JSONModelsProvider';
 
     private models: TLLMModelsList;
 
@@ -99,7 +100,7 @@ export class SmythModelsProvider extends ModelsProviderConnector {
                 this.models = scannedModels;
             }
 
-            SmythModelsProvider.localCache.clear();
+            JSONModelsProvider.localCache.clear();
 
             console.debug(`Successfully reindexed models. Total models: ${Object.keys(this.models).length}`);
         } catch (error) {
@@ -185,9 +186,30 @@ export class SmythModelsProvider extends ModelsProviderConnector {
         return this.isValidSingleModel(data);
     }
 
-    private async initDirWatcher(dir) {
-        if (!(await fs.stat(dir)).isDirectory()) {
-            console.warn(`Directory "${dir}" does not exist`);
+    private initDirWatcher(dir) {
+        // Synchronous file system operations for initial setup
+        try {
+            const stats = fsSync.statSync(dir);
+
+            if (!stats.isDirectory()) {
+                //is it a file?
+                if (stats.isFile()) {
+                    //load the file
+                    const fileContent = fsSync.readFileSync(dir, 'utf-8');
+                    const modelData = JSON.parse(fileContent);
+
+                    if (this._settings?.mode === 'merge') this.models = { ...this.models, ...modelData };
+                    else this.models = modelData;
+
+                    this.started = true;
+                    return;
+                }
+
+                console.warn(`Path "${dir}" is neither a file nor a directory`);
+                return;
+            }
+        } catch (error) {
+            console.warn(`Path "${dir}" does not exist or cannot be accessed:`, error.message);
             return;
         }
 
@@ -220,10 +242,11 @@ export class SmythModelsProvider extends ModelsProviderConnector {
                 console.debug(`File ${path} has been removed`);
                 debouncedReindex();
             })
-            .on('ready', () => {
+            .on('ready', async () => {
                 console.debug(`Watcher ready. Performing initial scan of ${dir}`);
                 // Do initial scan once when watcher is ready
-                this.reindexModels(dir);
+                await this.reindexModels(dir);
+                this.started = true;
             });
     }
 }

package/src/subsystems/LLMManager/ModelsProvider.service/index.ts

@@ -2,10 +2,10 @@
 
 import { ConnectorService, ConnectorServiceProvider } from '@sre/Core/ConnectorsService';
 import { TConnectorService } from '@sre/types/SRE.types';
-import { SmythModelsProvider } from './connectors/SmythModelsProvider.class';
+import { JSONModelsProvider } from './connectors/JSONModelsProvider.class';
 
 export class ModelsProviderService extends ConnectorServiceProvider {
     public register() {
-        ConnectorService.register(TConnectorService.ModelsProvider, 'SmythModelsProvider', SmythModelsProvider);
+        ConnectorService.register(TConnectorService.ModelsProvider, 'JSONModelsProvider', JSONModelsProvider);
     }
 }