@smythos/sre 1.6.8 → 1.6.10

package/src/Core/SmythRuntime.class.ts

@@ -1,241 +1,241 @@
-import { boot } from './boot';
-
-import { SREConfig, TConnectorService } from '@sre/types/SRE.types';
-import { Logger } from '../helpers/Log.helper';
-import { ConnectorService } from './ConnectorsService';
-import { SystemEvents } from './SystemEvents';
-import { findSmythPath } from '../helpers/Sysconfig.helper';
-import pkg from '../../package.json';
-
-const logger = Logger('SRE');
-
-export class SmythRuntime {
-    public started = false;
-
-    private _smythDir: string;
-    public get smythDir() {
-        return this._smythDir;
-    }
-    private _readyPromise: Promise<boolean>;
-    private _readyResolve: (value: boolean) => void;
-
-    public get version() {
-        return pkg.version;
-    }
-
-    private defaultConfig: SREConfig = {
-        Vault: {
-            Connector: 'JSONFileVault',
-            Settings: {
-                shared: 'default', //default team shares its secrets with all other teams
-            },
-        },
-        Account: {
-            Connector: 'DummyAccount',
-        },
-        Cache: {
-            Connector: 'RAM',
-        },
-        Storage: {
-            Connector: 'LocalStorage',
-        },
-        Code: {
-            Connector: 'DummyConnector',
-        },
-        //NKV should be loaded before VectorDB
-        NKV: {
-            Connector: 'LocalStorage',
-        },
-        VectorDB: {
-            Connector: 'RAMVec',
-        },
-        ModelsProvider: {
-            Connector: 'JSONModelsProvider',
-        },
-        AgentData: {
-            Connector: 'NullAgentData',
-        },
-        Component: {
-            Connector: 'LocalComponent',
-        },
-        ManagedVault: {
-            Connector: 'NullManagedVault',
-        },
-        Log: {
-            Connector: 'ConsoleLog',
-        },
-        Router: {
-            Connector: 'NullRouter',
-        },
-    };
-
-    protected constructor() {
-        this.started = true;
-        this._readyPromise = new Promise((resolve) => {
-            this._readyResolve = resolve;
-        });
-    }
-
-    protected static instance?: SmythRuntime;
-    public static get Instance(): SmythRuntime {
-        if (!SmythRuntime.instance) {
-            SmythRuntime.instance = new SmythRuntime();
-        }
-        return SmythRuntime.instance;
-    }
-
-    private _initializing = false;
-
-    public get initializing() {
-        return this._initializing;
-    }
-
-    private _initialized = false;
-
-    public init(_config?: SREConfig): SmythRuntime {
-        logger.info(`SRE v${this.version} initializing...`);
-        if (!_config || JSON.stringify(_config) === '{}') {
-            this._smythDir = findSmythPath();
-            logger.info('.smyth directory found in:', this._smythDir);
-        }
-
-        if (this._initializing) {
-            console.warn('You tried to initialize SRE while it is already initializing ... skipping');
-            return;
-        }
-        if (this._initialized) {
-            throw new Error('SRE already initialized');
-        }
-        this._initializing = true;
-        SystemEvents.on('SRE:Booted', () => {
-            this._readyResolve(true);
-        });
-        boot();
-
-        const config = this.autoConf(_config);
-
-        for (let connectorType in config) {
-            for (let configEntry of config[connectorType]) {
-                const connector = ConnectorService.init(
-                    connectorType as TConnectorService,
-                    configEntry.Connector,
-                    configEntry.Id,
-                    configEntry.Settings,
-                    configEntry.Default
-                );
-                if (!connector) {
-                    logger.warn(`Failed to initialize connector ${connectorType}:${configEntry.Id || configEntry.Connector}`);
-                }
-            }
-        }
-
-        this._initialized = true;
-        SystemEvents.emit('SRE:Initialized', SmythRuntime.Instance);
-
-        return SmythRuntime.Instance as SmythRuntime;
-    }
-
-    /**
-     * This function tries to auto configure, or fixes the provided configuration
-     *
-     * FIXME: The current version does not actually auto configure SRE, it just fixes the provided configuration for now
-     * TODO: Implement auto configuration based on present environment variables and auto-detected configs
-     * @param config
-     */
-    private autoConf(config: SREConfig = {}) {
-        // default config for missing connectors
-        const defaultConfig = JSON.parse(JSON.stringify(this.defaultConfig));
-
-        // for (let connectorType in defaultConfig) {
-        //     if (!config[connectorType]) {
-        //         config[connectorType] = defaultConfig[connectorType];
-        //     }
-        // }
-
-        const keys = Object.keys({ ...defaultConfig, ...config });
-
-        const newConfig: SREConfig = {};
-        for (let connectorType of keys) {
-            newConfig[connectorType] = [];
-
-            let entry = config[connectorType] || defaultConfig[connectorType];
-            if (!Array.isArray(entry)) {
-                entry = [entry];
-            }
-
-            let hasDefault = false;
-            for (let connector of entry) {
-                if (!connector.Connector) {
-                    logger.warn(`Missing Connector Name in ${connectorType} entry ... it will be ignored`);
-                    continue;
-                }
-                if (connector.Default) {
-                    if (hasDefault) {
-                        logger.warn(`Entry ${connectorType} has more than one default Connector ... only the first one will be used`);
-                    }
-                    hasDefault = true;
-                }
-                newConfig[connectorType].push(connector);
-            }
-
-            if (!hasDefault && newConfig[connectorType].length > 0) {
-                newConfig[connectorType][0].Default = true;
-            }
-        }
-
-        return newConfig;
-    }
-
-    public ready(): Promise<boolean> {
-        return this._readyPromise;
-    }
-
-    private _stopping = false;
-    public async _stop() {
-        if (this._stopping) {
-            return;
-        }
-        this._stopping = true;
-        logger.info('Sending Shutdown Signals To All Subsystems...');
-        await ConnectorService._stop();
-        SmythRuntime.instance = undefined;
-        this.started = false;
-    }
-}
-
-export const SRE = SmythRuntime.Instance;
-let shuttingDown = false;
-
-async function shutdown(reason) {
-    if (!SmythRuntime.Instance.started) return;
-    if (shuttingDown) return;
-    shuttingDown = true;
-
-    logger.info(`Caught ${reason} ... Attempting graceful shutdown`);
-    if (SmythRuntime.Instance) {
-        try {
-            await SmythRuntime.Instance._stop();
-        } catch (err) {
-            logger.error('Shutdown error:', err);
-        }
-    }
-}
-
-['SIGINT', 'SIGTERM'].forEach((signal) => {
-    process.on(signal, async () => {
-        await shutdown(signal);
-        process.exit(0); // Required after async
-    });
-});
-
-process.on('beforeExit', (code) => {
-    shutdown('beforeExit');
-});
-
-process.on('exit', (code) => {
-    logger.info(`Goodbye!`);
-});
-
-// process.on('uncaughtException', (err) => {
-
-// });
+import { boot } from './boot';
+
+import { SREConfig, TConnectorService } from '@sre/types/SRE.types';
+import { Logger } from '../helpers/Log.helper';
+import { ConnectorService } from './ConnectorsService';
+import { SystemEvents } from './SystemEvents';
+import { findSmythPath } from '../helpers/Sysconfig.helper';
+import pkg from '../../package.json';
+
+const logger = Logger('SRE');
+
+export class SmythRuntime {
+    public started = false;
+
+    private _smythDir: string;
+    public get smythDir() {
+        return this._smythDir;
+    }
+    private _readyPromise: Promise<boolean>;
+    private _readyResolve: (value: boolean) => void;
+
+    public get version() {
+        return pkg.version;
+    }
+
+    private defaultConfig: SREConfig = {
+        Vault: {
+            Connector: 'JSONFileVault',
+            Settings: {
+                shared: 'default', //default team shares its secrets with all other teams
+            },
+        },
+        Account: {
+            Connector: 'DummyAccount',
+        },
+        Cache: {
+            Connector: 'RAM',
+        },
+        Storage: {
+            Connector: 'LocalStorage',
+        },
+        Code: {
+            Connector: 'DummyConnector',
+        },
+        //NKV should be loaded before VectorDB
+        NKV: {
+            Connector: 'LocalStorage',
+        },
+        VectorDB: {
+            Connector: 'RAMVec',
+        },
+        ModelsProvider: {
+            Connector: 'JSONModelsProvider',
+        },
+        AgentData: {
+            Connector: 'NullAgentData',
+        },
+        Component: {
+            Connector: 'LocalComponent',
+        },
+        ManagedVault: {
+            Connector: 'NullManagedVault',
+        },
+        Log: {
+            Connector: 'ConsoleLog',
+        },
+        Router: {
+            Connector: 'NullRouter',
+        },
+    };
+
+    protected constructor() {
+        this.started = true;
+        this._readyPromise = new Promise((resolve) => {
+            this._readyResolve = resolve;
+        });
+    }
+
+    protected static instance?: SmythRuntime;
+    public static get Instance(): SmythRuntime {
+        if (!SmythRuntime.instance) {
+            SmythRuntime.instance = new SmythRuntime();
+        }
+        return SmythRuntime.instance;
+    }
+
+    private _initializing = false;
+
+    public get initializing() {
+        return this._initializing;
+    }
+
+    private _initialized = false;
+
+    public init(_config?: SREConfig): SmythRuntime {
+        logger.info(`SRE v${this.version} initializing...`);
+        if (!_config || JSON.stringify(_config) === '{}') {
+            this._smythDir = findSmythPath();
+            logger.info('.smyth directory found in:', this._smythDir);
+        }
+
+        if (this._initializing) {
+            console.warn('You tried to initialize SRE while it is already initializing ... skipping');
+            return;
+        }
+        if (this._initialized) {
+            throw new Error('SRE already initialized');
+        }
+        this._initializing = true;
+        SystemEvents.on('SRE:Booted', () => {
+            this._readyResolve(true);
+        });
+        boot();
+
+        const config = this.autoConf(_config);
+
+        for (let connectorType in config) {
+            for (let configEntry of config[connectorType]) {
+                const connector = ConnectorService.init(
+                    connectorType as TConnectorService,
+                    configEntry.Connector,
+                    configEntry.Id,
+                    configEntry.Settings,
+                    configEntry.Default
+                );
+                if (!connector) {
+                    logger.warn(`Failed to initialize connector ${connectorType}:${configEntry.Id || configEntry.Connector}`);
+                }
+            }
+        }
+
+        this._initialized = true;
+        SystemEvents.emit('SRE:Initialized', SmythRuntime.Instance);
+
+        return SmythRuntime.Instance as SmythRuntime;
+    }
+
+    /**
+     * This function tries to auto configure, or fixes the provided configuration
+     *
+     * FIXME: The current version does not actually auto configure SRE, it just fixes the provided configuration for now
+     * TODO: Implement auto configuration based on present environment variables and auto-detected configs
+     * @param config
+     */
+    private autoConf(config: SREConfig = {}) {
+        // default config for missing connectors
+        const defaultConfig = JSON.parse(JSON.stringify(this.defaultConfig));
+
+        // for (let connectorType in defaultConfig) {
+        //     if (!config[connectorType]) {
+        //         config[connectorType] = defaultConfig[connectorType];
+        //     }
+        // }
+
+        const keys = Object.keys({ ...defaultConfig, ...config });
+
+        const newConfig: SREConfig = {};
+        for (let connectorType of keys) {
+            newConfig[connectorType] = [];
+
+            let entry = config[connectorType] || defaultConfig[connectorType];
+            if (!Array.isArray(entry)) {
+                entry = [entry];
+            }
+
+            let hasDefault = false;
+            for (let connector of entry) {
+                if (!connector.Connector) {
+                    logger.warn(`Missing Connector Name in ${connectorType} entry ... it will be ignored`);
+                    continue;
+                }
+                if (connector.Default) {
+                    if (hasDefault) {
+                        logger.warn(`Entry ${connectorType} has more than one default Connector ... only the first one will be used`);
+                    }
+                    hasDefault = true;
+                }
+                newConfig[connectorType].push(connector);
+            }
+
+            if (!hasDefault && newConfig[connectorType].length > 0) {
+                newConfig[connectorType][0].Default = true;
+            }
+        }
+
+        return newConfig;
+    }
+
+    public ready(): Promise<boolean> {
+        return this._readyPromise;
+    }
+
+    private _stopping = false;
+    public async _stop() {
+        if (this._stopping) {
+            return;
+        }
+        this._stopping = true;
+        logger.info('Sending Shutdown Signals To All Subsystems...');
+        await ConnectorService._stop();
+        SmythRuntime.instance = undefined;
+        this.started = false;
+    }
+}
+
+export const SRE = SmythRuntime.Instance;
+let shuttingDown = false;
+
+async function shutdown(reason) {
+    if (!SmythRuntime.Instance.started) return;
+    if (shuttingDown) return;
+    shuttingDown = true;
+
+    logger.info(`Caught ${reason} ... Attempting graceful shutdown`);
+    if (SmythRuntime.Instance) {
+        try {
+            await SmythRuntime.Instance._stop();
+        } catch (err) {
+            logger.error('Shutdown error:', err);
+        }
+    }
+}
+
+['SIGINT', 'SIGTERM'].forEach((signal) => {
+    process.on(signal, async () => {
+        await shutdown(signal);
+        process.exit(0); // Required after async
+    });
+});
+
+process.on('beforeExit', (code) => {
+    shutdown('beforeExit');
+});
+
+process.on('exit', (code) => {
+    logger.info(`Goodbye!`);
+});
+
+// process.on('uncaughtException', (err) => {
+
+// });

package/src/Core/SystemEvents.ts

@@ -1,16 +1,16 @@
-import { SmythLLMUsage, SmythTaskUsage } from '@sre/types/LLM.types';
-import { TServiceRegistry } from '@sre/types/SRE.types';
-import { EventEmitter } from 'events';
-
-export type SystemEventMap = {
-    'SRE:BootStart': [];
-    'SRE:Booted': [TServiceRegistry];
-    'SRE:Initialized': [any?];
-    'USAGE:LLM': [SmythLLMUsage];
-    'USAGE:API': any;
-    'USAGE:TASK': [SmythTaskUsage];
-};
-
-const SystemEvents = new EventEmitter<SystemEventMap>();
-
-export { SystemEvents };
+import { SmythLLMUsage, SmythTaskUsage } from '@sre/types/LLM.types';
+import { TServiceRegistry } from '@sre/types/SRE.types';
+import { EventEmitter } from 'events';
+
+export type SystemEventMap = {
+    'SRE:BootStart': [];
+    'SRE:Booted': [TServiceRegistry];
+    'SRE:Initialized': [any?];
+    'USAGE:LLM': [SmythLLMUsage];
+    'USAGE:API': any;
+    'USAGE:TASK': [SmythTaskUsage];
+};
+
+const SystemEvents = new EventEmitter<SystemEventMap>();
+
+export { SystemEvents };

package/src/Core/boot.ts

@@ -1,56 +1,56 @@
-import { StorageService } from '@sre/IO/Storage.service';
-import { LLMService } from '@sre/LLMManager/LLM.service';
-import { SystemEvents } from './SystemEvents';
-import { CacheService } from '@sre/MemoryManager/Cache.service';
-import { Logger } from '../helpers/Log.helper';
-import { TServiceRegistry } from '@sre/types/SRE.types';
-import { VaultService } from '@sre/Security/Vault.service';
-import { AccountService } from '@sre/Security/Account.service';
-import { AgentDataService } from '@sre/AgentManager/AgentData.service';
-import { VectorDBService } from '@sre/IO/VectorDB.service';
-import { CLIService } from '@sre/IO/CLI.service';
-import { NKVService } from '@sre/IO/NKV.service';
-import { RouterService } from '@sre/IO/Router.service';
-import { ManagedVaultService } from '@sre/Security/ManagedVault.service';
-import { LogService } from '@sre/IO/Log.service';
-import { ComponentService } from '@sre/AgentManager/Component.service';
-import { ModelsProviderService } from '@sre/LLMManager/ModelsProvider.service';
-import { CodeService } from '@sre/ComputeManager/Code.service';
-const console = Logger('Boot');
-let _booted = false;
-export function boot() {
-    if (_booted) {
-        console.warn('SRE already booted');
-        return;
-    }
-    _booted = true;
-    SystemEvents.emit('SRE:BootStart');
-    console.debug('SRE Boot sequence started');
-    const service: TServiceRegistry = {};
-    service.NKV = new NKVService();
-    service.Account = new AccountService();
-    service.Vault = new VaultService();
-    service.ManagedVault = new ManagedVaultService();
-    service.Cache = new CacheService();
-    service.Storage = new StorageService();
-    service.ModelsProvider = new ModelsProviderService();
-    service.LLM = new LLMService();
-    service.AgentData = new AgentDataService();
-    service.CLI = new CLIService();
-    service.VectorDB = new VectorDBService();
-    service.Router = new RouterService();
-    service.Log = new LogService();
-    service.Component = new ComponentService();
-    service.Code = new CodeService();
-
-    SystemEvents.on('SRE:Initialized', () => {
-        console.debug('SRE Initialized');
-        for (let key in service) {
-            service[key].init();
-        }
-
-        SystemEvents.emit('SRE:Booted', service);
-
-        console.debug('SRE Boot sequence completed');
-    });
-}
+import { StorageService } from '@sre/IO/Storage.service';
+import { LLMService } from '@sre/LLMManager/LLM.service';
+import { SystemEvents } from './SystemEvents';
+import { CacheService } from '@sre/MemoryManager/Cache.service';
+import { Logger } from '../helpers/Log.helper';
+import { TServiceRegistry } from '@sre/types/SRE.types';
+import { VaultService } from '@sre/Security/Vault.service';
+import { AccountService } from '@sre/Security/Account.service';
+import { AgentDataService } from '@sre/AgentManager/AgentData.service';
+import { VectorDBService } from '@sre/IO/VectorDB.service';
+import { CLIService } from '@sre/IO/CLI.service';
+import { NKVService } from '@sre/IO/NKV.service';
+import { RouterService } from '@sre/IO/Router.service';
+import { ManagedVaultService } from '@sre/Security/ManagedVault.service';
+import { LogService } from '@sre/IO/Log.service';
+import { ComponentService } from '@sre/AgentManager/Component.service';
+import { ModelsProviderService } from '@sre/LLMManager/ModelsProvider.service';
+import { CodeService } from '@sre/ComputeManager/Code.service';
+const console = Logger('Boot');
+let _booted = false;
+export function boot() {
+    if (_booted) {
+        console.warn('SRE already booted');
+        return;
+    }
+    _booted = true;
+    SystemEvents.emit('SRE:BootStart');
+    console.debug('SRE Boot sequence started');
+    const service: TServiceRegistry = {};
+    service.NKV = new NKVService();
+    service.Account = new AccountService();
+    service.Vault = new VaultService();
+    service.ManagedVault = new ManagedVaultService();
+    service.Cache = new CacheService();
+    service.Storage = new StorageService();
+    service.ModelsProvider = new ModelsProviderService();
+    service.LLM = new LLMService();
+    service.AgentData = new AgentDataService();
+    service.CLI = new CLIService();
+    service.VectorDB = new VectorDBService();
+    service.Router = new RouterService();
+    service.Log = new LogService();
+    service.Component = new ComponentService();
+    service.Code = new CodeService();
+
+    SystemEvents.on('SRE:Initialized', () => {
+        console.debug('SRE Initialized');
+        for (let key in service) {
+            service[key].init();
+        }
+
+        SystemEvents.emit('SRE:Booted', service);
+
+        console.debug('SRE Boot sequence completed');
+    });
+}

package/src/config.ts

@@ -1,15 +1,15 @@
-import dotenv from 'dotenv';
-dotenv.config();
-//FIXME : this is a legacy structure from Smyth SaaS we need to convert it to a Service/Connector structure
-const config = {
-    env: {
-        LOG_LEVEL: process.env.LOG_LEVEL || 'none',
-        LOG_FILTER: process.env.LOG_FILTER || '',
-        NODE_ENV: process.env?.NODE_ENV,
-    },
-    agent: {
-        ENDPOINT_PREFIX: '/api',
-    },
-};
-
-export default config;
+import dotenv from 'dotenv';
+dotenv.config();
+//FIXME : this is a legacy structure from Smyth SaaS we need to convert it to a Service/Connector structure
+const config = {
+    env: {
+        LOG_LEVEL: process.env.LOG_LEVEL || 'none',
+        LOG_FILTER: process.env.LOG_FILTER || '',
+        NODE_ENV: process.env?.NODE_ENV,
+    },
+    agent: {
+        ENDPOINT_PREFIX: '/api',
+    },
+};
+
+export default config;