@smythos/sre 1.6.1 → 1.6.8

package/src/Components/ForEach.class.ts

@@ -1,97 +1,97 @@
-import { IAgent as Agent } from '@sre/types/Agent.types';
-import { Component } from './Component.class';
-import Joi from 'joi';
-import { JSONContent } from '@sre/helpers/JsonContent.helper';
-
-export class ForEach extends Component {
-    protected configSchema = null;
-    constructor() {
-        super();
-    }
-    init() {}
-    async process(input, config, agent: Agent) {
-        await super.process(input, config, agent);
-        let Loop = {};
-        let Result;
-        let _temp_result;
-        let _error = null;
-        let _in_progress = true;
-        const logger = this.createComponentLogger(agent, config);
-        try {
-            const inputObject = input.Input;
-            let inputArray;
-
-            //Try to parse multiple arrays formats since forEach always expects and array
-            if (Array.isArray(inputObject)) inputArray = inputObject;
-            else {
-                if (typeof inputObject === 'string') {
-                    inputArray = inputObject.trim().startsWith('[') ? JSONContent(inputObject).tryParse() : inputObject.split(',');
-                } else {
-                    inputArray = [inputObject];
-                }
-            }
-
-            if (!Array.isArray(inputArray) && typeof inputArray === 'object')
-                //if json object, use the values
-                inputArray = Object.values(inputArray);
-
-            const runtimeData = agent.agentRuntime.getRuntimeData(config.id);
-            const _ForEachData = runtimeData._LoopData || { parentId: config.id, loopIndex: 0, loopLength: inputArray.length };
-
-            logger.debug(`Loop: ${_ForEachData.loopIndex} / ${_ForEachData.loopLength}`);
-            delete _ForEachData.branches; //reset branches (the number of branches is calculated in CallComponent@Agent.class.ts )
-
-            if (_ForEachData.result) {
-                _temp_result = _ForEachData.result;
-                logger.debug(`  => Loop Result : ${JSON.stringify(Loop, null, 2)}`);
-                logger.debug(`---------------------------------------------------`);
-            }
-
-            Loop = inputArray[_ForEachData.loopIndex];
-
-            logger.debug(`  => Loop Data : ${JSON.stringify(Loop, null, 2)}`);
-
-            _in_progress = Loop !== undefined;
-            if (_in_progress) {
-                _ForEachData.loopIndex++;
-            }
-            _ForEachData._in_progress = _in_progress;
-
-            agent.agentRuntime.updateRuntimeData(config.id, { _LoopData: _ForEachData });
-        } catch (error: any) {
-            _error = error;
-            logger.error(error);
-        }
-        if (!_in_progress) {
-            Result = _temp_result || [];
-
-            switch (config?.data?.format) {
-                case 'minimal':
-                    Result = Result.map((item) => cleanupResult(item.result));
-                    break;
-                case 'results-array':
-                    Result = Result.map((item) => Object.values(cleanupResult(item.result))).flat(Infinity);
-                    break;
-            }
-        }
-
-        return { Loop, Result, _temp_result, _error, _in_progress, _debug: logger.output };
-    }
-    async postProcess(output, config, agent: Agent): Promise<any> {
-        output = await super.postProcess(output, config, agent);
-        if (output?.result) {
-            delete output.result._temp_result;
-            delete output.result._in_progress;
-            delete output.result.Loop;
-        }
-        return output;
-    }
-}
-function cleanupResult(result) {
-    if (typeof result !== 'object') return result;
-    if (result._debug) delete result._debug;
-    if (result._error) delete result._error;
-    if (result._temp_result) delete result._temp_result;
-    if (result._in_progress) delete result._in_progress;
-    return result;
-}
+import { IAgent as Agent } from '@sre/types/Agent.types';
+import { Component } from './Component.class';
+import Joi from 'joi';
+import { JSONContent } from '@sre/helpers/JsonContent.helper';
+
+export class ForEach extends Component {
+    protected configSchema = null;
+    constructor() {
+        super();
+    }
+    init() {}
+    async process(input, config, agent: Agent) {
+        await super.process(input, config, agent);
+        let Loop = {};
+        let Result;
+        let _temp_result;
+        let _error = null;
+        let _in_progress = true;
+        const logger = this.createComponentLogger(agent, config);
+        try {
+            const inputObject = input.Input;
+            let inputArray;
+
+            //Try to parse multiple arrays formats since forEach always expects and array
+            if (Array.isArray(inputObject)) inputArray = inputObject;
+            else {
+                if (typeof inputObject === 'string') {
+                    inputArray = inputObject.trim().startsWith('[') ? JSONContent(inputObject).tryParse() : inputObject.split(',');
+                } else {
+                    inputArray = [inputObject];
+                }
+            }
+
+            if (!Array.isArray(inputArray) && typeof inputArray === 'object')
+                //if json object, use the values
+                inputArray = Object.values(inputArray);
+
+            const runtimeData = agent.agentRuntime.getRuntimeData(config.id);
+            const _ForEachData = runtimeData._LoopData || { parentId: config.id, loopIndex: 0, loopLength: inputArray.length };
+
+            logger.debug(`Loop: ${_ForEachData.loopIndex} / ${_ForEachData.loopLength}`);
+            delete _ForEachData.branches; //reset branches (the number of branches is calculated in CallComponent@Agent.class.ts )
+
+            if (_ForEachData.result) {
+                _temp_result = _ForEachData.result;
+                logger.debug(`  => Loop Result : ${JSON.stringify(Loop, null, 2)}`);
+                logger.debug(`---------------------------------------------------`);
+            }
+
+            Loop = inputArray[_ForEachData.loopIndex];
+
+            logger.debug(`  => Loop Data : ${JSON.stringify(Loop, null, 2)}`);
+
+            _in_progress = Loop !== undefined;
+            if (_in_progress) {
+                _ForEachData.loopIndex++;
+            }
+            _ForEachData._in_progress = _in_progress;
+
+            agent.agentRuntime.updateRuntimeData(config.id, { _LoopData: _ForEachData });
+        } catch (error: any) {
+            _error = error;
+            logger.error(error);
+        }
+        if (!_in_progress) {
+            Result = _temp_result || [];
+
+            switch (config?.data?.format) {
+                case 'minimal':
+                    Result = Result.map((item) => cleanupResult(item.result));
+                    break;
+                case 'results-array':
+                    Result = Result.map((item) => Object.values(cleanupResult(item.result))).flat(Infinity);
+                    break;
+            }
+        }
+
+        return { Loop, Result, _temp_result, _error, _in_progress, _debug: logger.output };
+    }
+    async postProcess(output, config, agent: Agent): Promise<any> {
+        output = await super.postProcess(output, config, agent);
+        if (output?.result) {
+            delete output.result._temp_result;
+            delete output.result._in_progress;
+            delete output.result.Loop;
+        }
+        return output;
+    }
+}
+function cleanupResult(result) {
+    if (typeof result !== 'object') return result;
+    if (result._debug) delete result._debug;
+    if (result._error) delete result._error;
+    if (result._temp_result) delete result._temp_result;
+    if (result._in_progress) delete result._in_progress;
+    return result;
+}

package/src/Components/GPTPlugin.class.ts

@@ -1,70 +1,70 @@
-import Joi from 'joi';
-
-import { Agent } from '@sre/AgentManager/Agent.class';
-import { Conversation } from '@sre/helpers/Conversation.helper';
-import { TemplateString } from '@sre/helpers/TemplateString.helper';
-
-import { Component } from './Component.class';
-
-export class GPTPlugin extends Component {
-    protected configSchema = Joi.object({
-        model: Joi.string().optional(),
-        openAiModel: Joi.string().optional(), // for backward compatibility
-        specUrl: Joi.string().max(2048).uri().required().description('URL of the OpenAPI specification'),
-        descForModel: Joi.string().max(5000).required().allow('').label('Description for Model'),
-        name: Joi.string().max(500).required().allow(''),
-        desc: Joi.string().max(5000).required().allow('').label('Description'),
-        logoUrl: Joi.string().max(8192).allow(''),
-        id: Joi.string().max(200),
-        version: Joi.string().max(100).allow(''),
-        domain: Joi.string().max(253).allow(''),
-    });
-
-    constructor() {
-        super();
-    }
-
-    init() {}
-
-    async process(input, config, agent: Agent) {
-        await super.process(input, config, agent);
-        const logger = this.createComponentLogger(agent, config);
-
-        logger.debug(`=== Open API Log ===`);
-
-        try {
-            const specUrl = config?.data?.specUrl;
-
-            if (!specUrl) {
-                return { _error: 'Please provide a Open API Specification URL!', _debug: logger.output };
-            }
-
-            const model = config?.data?.model || config?.data?.openAiModel;
-            const descForModel = TemplateString(config?.data?.descForModel).parse(input).result;
-            let prompt = '';
-
-            if (input?.Prompt) {
-                prompt = typeof input?.Prompt === 'string' ? input?.Prompt : JSON.stringify(input?.Prompt);
-            } else if (input?.Query) {
-                prompt = typeof input?.Query === 'string' ? input?.Query : JSON.stringify(input?.Query);
-            }
-
-            if (!prompt) {
-                return { _error: 'Please provide a prompt', _debug: logger.output };
-            }
-
-            // TODO [Forhad]: Need to check and validate input prompt token
-
-            const conv = new Conversation(model, specUrl, { systemPrompt: descForModel, agentId: agent?.id });
-
-            const result = await conv.prompt(prompt);
-
-            logger.debug(`Response:\n`, result, '\n');
-
-            return { Output: result, _debug: logger.output };
-        } catch (error: any) {
-            console.error('Error on running Open API: ', error);
-            return { _error: `Error on running Open API!\n${error?.message || JSON.stringify(error)}`, _debug: logger.output };
-        }
-    }
-}
+import Joi from 'joi';
+
+import { Agent } from '@sre/AgentManager/Agent.class';
+import { Conversation } from '@sre/helpers/Conversation.helper';
+import { TemplateString } from '@sre/helpers/TemplateString.helper';
+
+import { Component } from './Component.class';
+
+export class GPTPlugin extends Component {
+    protected configSchema = Joi.object({
+        model: Joi.string().optional(),
+        openAiModel: Joi.string().optional(), // for backward compatibility
+        specUrl: Joi.string().max(2048).uri().required().description('URL of the OpenAPI specification'),
+        descForModel: Joi.string().max(5000).required().allow('').label('Description for Model'),
+        name: Joi.string().max(500).required().allow(''),
+        desc: Joi.string().max(5000).required().allow('').label('Description'),
+        logoUrl: Joi.string().max(8192).allow(''),
+        id: Joi.string().max(200),
+        version: Joi.string().max(100).allow(''),
+        domain: Joi.string().max(253).allow(''),
+    });
+
+    constructor() {
+        super();
+    }
+
+    init() {}
+
+    async process(input, config, agent: Agent) {
+        await super.process(input, config, agent);
+        const logger = this.createComponentLogger(agent, config);
+
+        logger.debug(`=== Open API Log ===`);
+
+        try {
+            const specUrl = config?.data?.specUrl;
+
+            if (!specUrl) {
+                return { _error: 'Please provide a Open API Specification URL!', _debug: logger.output };
+            }
+
+            const model = config?.data?.model || config?.data?.openAiModel;
+            const descForModel = TemplateString(config?.data?.descForModel).parse(input).result;
+            let prompt = '';
+
+            if (input?.Prompt) {
+                prompt = typeof input?.Prompt === 'string' ? input?.Prompt : JSON.stringify(input?.Prompt);
+            } else if (input?.Query) {
+                prompt = typeof input?.Query === 'string' ? input?.Query : JSON.stringify(input?.Query);
+            }
+
+            if (!prompt) {
+                return { _error: 'Please provide a prompt', _debug: logger.output };
+            }
+
+            // TODO [Forhad]: Need to check and validate input prompt token
+
+            const conv = new Conversation(model, specUrl, { systemPrompt: descForModel, agentId: agent?.id });
+
+            const result = await conv.prompt(prompt);
+
+            logger.debug(`Response:\n`, result, '\n');
+
+            return { Output: result, _debug: logger.output };
+        } catch (error: any) {
+            console.error('Error on running Open API: ', error);
+            return { _error: `Error on running Open API!\n${error?.message || JSON.stringify(error)}`, _debug: logger.output };
+        }
+    }
+}