@smythos/sre 1.7.16 → 1.7.17

package/dist/types/subsystems/AgentManager/Agent.class.d.ts

@@ -10,6 +10,7 @@ export declare class Agent implements IAgent {
     name: any;
     data: any;
     teamId: any;
+    conversationId: string;
     components: any;
     connections: any;
     endpoints: any;
@@ -51,7 +52,7 @@ export declare class Agent implements IAgent {
     private parseVariables;
     process(endpointPath: any, input: any): Promise<any>;
     private updateTasksCount;
-    postProcess(result: any): Promise<any>;
+    postProcess(_result: any): Promise<any>;
     private hasLoopAncestor;
     private clearChildLoopRuntimeComponentData;
     private getComponentMissingInputs;

package/dist/types/subsystems/AgentManager/EmbodimentSettings.class.d.ts

@@ -5,4 +5,5 @@ export declare class EmbodimentSettings {
     init(agentId: any): Promise<void>;
     ready(maxWait?: number): Promise<unknown>;
     get(embodimentType: string, key?: string): any;
+    getAll(): {};
 }

package/dist/types/types/Agent.types.d.ts

@@ -11,6 +11,7 @@ export type TAgentProcessParams = {
     params?: any;
 };
 export interface IAgent {
+    conversationId: string;
     id: any;
     jobID: any;
     async: boolean;

package/package.json

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

package/src/Components/APIEndpoint.class.ts

@@ -78,25 +78,6 @@ export class APIEndpoint extends Component {
         let query = req && !isTrigger ? req.query : {};
         const _authInfo = req ? req._agent_authinfo : undefined;
 
-        // parse template variables
-        for (const [key, value] of Object.entries(body)) {
-            if (isKeyTemplateVar(value as string)) {
-                body[key] = await parseKey(value as string, agent?.teamId);
-            } else if (isTemplateVar(value as string)) {
-                //body[key] = parseTemplate(value as string, input, { escapeString: false });
-                body[key] = TemplateString(value as string).parse(input).result;
-            }
-        }
-
-        for (const [key, value] of Object.entries(query)) {
-            if (isKeyTemplateVar(value as string)) {
-                query[key] = await parseKey(value as string, agent?.teamId);
-            } else if (isTemplateVar(value as string)) {
-                //query[key] = parseTemplate(value as string, input, { escapeString: false });
-                query[key] = TemplateString(value as string).parse(input).result;
-            }
-        }
-
         // set default value and agent variables
         const inputsWithDefaultValue = config.inputs.filter(
             (input) => input.defaultVal !== undefined && input.defaultVal !== '' && input.defaultVal !== null
@@ -158,15 +139,23 @@ export class APIEndpoint extends Component {
             //body = input;
         }
 
-        // ensure strong data type
+        // #region parse all template variables (after debugger injection and defaults are set)
+        body = await resolveTemplateVariables(body, input, agent);
+        query = await resolveTemplateVariables(query, input, agent);
+        // #endregion parse all template variables
+
+        // #region ensure strong data type
         body = await performTypeInference(body, config.inputs, agent);
         query = await performTypeInference(query, config.inputs, agent);
+        // #endregion ensure strong data type
 
+        // #region log inputs
         logger.debug('Parsing inputs');
         logger.debug(' Headers', headers);
         logger.debug(' Body', body);
         logger.debug(' Params', params);
         logger.debug(' Query', query);
+        // #endregion log inputs
 
         //Handle JSON Data
         //FIXME : this is a workaround that parses any json string in the body, we should only parse the json string in the body if the data type is explicitely set to JSON
@@ -251,3 +240,20 @@ export class APIEndpoint extends Component {
         return output;
     }
 }
+
+async function resolveTemplateVariables(data: any, input: any, agent: Agent): Promise<any> {
+    for (const [key, value] of Object.entries(data)) {
+        if (isKeyTemplateVar(value as string)) {
+            data[key] = await parseKey(value as string, agent.teamId);
+        } else if (isTemplateVar(value as string)) {
+            // Parse using input values first, then agent variables.
+            // This correctly resolves cases where input values reference agent variables with the same name.
+            // Example: agent variables { user_id: "123" }, input { user_id: "{{user_id}}" }.
+            data[key] = TemplateString(value as string)
+                .parse(input)
+                .parse(agent.agentVariables).result;
+        }
+    }
+
+    return data;
+}

package/src/Components/ServerlessCode.class.ts

@@ -5,9 +5,9 @@ import { ConnectorService } from '@sre/Core/ConnectorsService';
 import { AWSCredentials, AWSRegionConfig } from '@sre/types/AWS.types';
 import { calculateExecutionCost, generateCodeFromLegacyComponent, getLambdaCredentials, reportUsage } from '@sre/helpers/AWSLambdaCode.helper';
 import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
+import { TemplateString } from '@sre/helpers/TemplateString.helper';
 
 export class ServerlessCode extends Component {
-
     protected configSchema = Joi.object({
         code_imports: Joi.string().max(1000).allow('').label('Imports'),
         code_body: Joi.string().max(500000).allow('').label('Code'),
@@ -26,10 +26,10 @@ export class ServerlessCode extends Component {
     constructor() {
         super();
     }
-    init() { }
+    init() {}
 
     async process(input, config, agent: Agent) {
-        await new Promise(resolve => setTimeout(resolve, 10000));
+        await new Promise((resolve) => setTimeout(resolve, 10000));
         await super.process(input, config, agent);
         const logger = this.createComponentLogger(agent, config);
         try {
@@ -39,22 +39,29 @@ export class ServerlessCode extends Component {
             const componentInputs = agent.components[config.id]?.inputs || {};
 
             let codeInputs = {};
+
             for (let field of componentInputs) {
-                const _type = typeof input[field.name];
+                // Parse using input values first, then agent variables.
+                // This correctly resolves cases where input values reference agent variables with the same name.
+                // Example: agent variables { user_id: "123" }, input { user_id: "{{user_id}}" }.
+                const inputValue = TemplateString(input[field.name]).parse(input).parse(agent.agentVariables).result;
+
+                const _type = typeof inputValue;
+
                 switch (_type) {
                     case 'string':
                         try {
-                            codeInputs[field.name] = JSON.parse(input[field.name].replace(/\\"/g, '"'));
+                            codeInputs[field.name] = JSON.parse(inputValue.replace(/\\"/g, '"'));
                         } catch (error) {
-                            codeInputs[field.name] = `${input[field.name]}`;
+                            codeInputs[field.name] = `${inputValue}`;
                         }
                         break;
                     case 'number':
                     case 'boolean':
-                        codeInputs[field.name] = input[field.name];
+                        codeInputs[field.name] = inputValue;
                         break;
                     default:
-                        codeInputs[field.name] = input[field.name];
+                        codeInputs[field.name] = inputValue;
                         break;
                 }
             }
@@ -62,35 +69,38 @@ export class ServerlessCode extends Component {
             logger.debug(`\nInput Variables: \n${JSON.stringify(codeInputs, null, 2)}\n`);
 
             let codeConnector = ConnectorService.getCodeConnector();
-            let codeCredentials: AWSCredentials & AWSRegionConfig & { isUserProvidedKeys: boolean } =
-                await getLambdaCredentials(agent, config);
+            let codeCredentials: AWSCredentials & AWSRegionConfig & { isUserProvidedKeys: boolean } = await getLambdaCredentials(agent, config);
 
             if (codeCredentials.isUserProvidedKeys) {
                 codeConnector = codeConnector.instance({
                     region: codeCredentials.region,
                     accessKeyId: codeCredentials.accessKeyId,
                     secretAccessKey: codeCredentials.secretAccessKey,
-                })
+                });
             }
             let code = config?.data?.code;
             if (!code) {
-                code = generateCodeFromLegacyComponent(config.data.code_body, config.data.code_imports, Object.keys(codeInputs))
+                code = generateCodeFromLegacyComponent(config.data.code_body, config.data.code_imports, Object.keys(codeInputs));
             }
             // Deploy lambda function if it doesn't exist or the code hash is different
-            await codeConnector.agent(agent.id)
-                .deploy(config.id, {
+            await codeConnector.agent(agent.id).deploy(
+                config.id,
+                {
                     code,
                     inputs: codeInputs,
-                }, {
+                },
+                {
                     runtime: 'nodejs',
-                });
+                }
+            );
 
             try {
                 const executionResponse = await codeConnector.agent(agent.id).execute(config.id, codeInputs);
                 const executionTime = executionResponse.executionTime;
                 logger.debug(
-                    `Code result:\n ${typeof executionResponse.output === 'object' ? JSON.stringify(executionResponse.output, null, 2) : executionResponse.output
-                    }\n`,
+                    `Code result:\n ${
+                        typeof executionResponse.output === 'object' ? JSON.stringify(executionResponse.output, null, 2) : executionResponse.output
+                    }\n`
                 );
                 logger.debug(`Execution time: ${executionTime}ms\n`);
 

package/src/helpers/Conversation.helper.ts

@@ -697,7 +697,7 @@ export class Conversation extends EventEmitter {
 
                 reqConfig.headers['X-CACHE-ID'] = this._context?.llmCache?.id;
 
-                reqConfig.headers['X-REQUEST-TAG'] = this.id;
+                //reqConfig.headers['X-REQUEST-TAG'] = this.id;
                 /*
                  * Objective for the following conditions:
                  * - In case it is not a debug call and there is no monitor id, then we need to run the agent locally to reduce latency
@@ -717,6 +717,10 @@ export class Conversation extends EventEmitter {
                     //reqConfig.headers['X-AGENT-HAS-ATTACHMENTS'] !== undefined;
                     reqConfig.headers['x-conversation-id'] !== undefined;
 
+                //we force the conversationId header after checking that it was not remotely set
+                if (!reqConfig.headers['x-conversation-id']) {
+                    reqConfig.headers['x-conversation-id'] = this.id;
+                }
                 if (canRunLocally && !requiresRemoteCall) {
                     console.log('RUNNING AGENT LOCALLY');
                     let agentProcess;
@@ -754,7 +758,7 @@ export class Conversation extends EventEmitter {
                             });
                         };
 
-                        const eventSource = new EventSource(monitUrl, {
+                        eventSource = new EventSource(monitUrl, {
                             fetch: customFetch,
                         });
                         let monitorId = '';

package/src/subsystems/AgentManager/Agent.class.ts

@@ -24,6 +24,8 @@ export class Agent implements IAgent {
     public name: any;
     public data: any;
     public teamId: any;
+    //if the agent was triggered from a conversation, this will be the conversation id
+    public conversationId: string;
     public components: any;
     public connections: any;
     public endpoints: any = {};
@@ -406,7 +408,8 @@ export class Agent implements IAgent {
     }
 
     @hookAsync('SREAgent.postProcess')
-    public async postProcess(result) {
+    public async postProcess(_result) {
+        let result = JSON.parse(JSON.stringify(_result)); //deep clone the result to avoid modifying the original object
         if (Array.isArray(result)) result = result.flat(Infinity);
         if (!Array.isArray(result)) result = [result];
 

package/src/subsystems/AgentManager/AgentRuntime.class.ts

@@ -90,6 +90,7 @@ export class AgentRuntime {
             this.xDebugRead = undefined;
         }
 
+        this.agent.conversationId = agent.agentRequest.header('X-CONVERSATION-ID');
         this.xDebugId = this.xDebugStop || this.xDebugRun || this.xDebugRead;
 
         //if (req.body) {

package/src/subsystems/AgentManager/EmbodimentSettings.class.ts

@@ -44,4 +44,12 @@ export class EmbodimentSettings {
         }
         return _embodiment?.properties;
     }
+
+    public getAll() {
+        const obj = {};
+        this._embodiments.forEach((embodiment: any) => {
+            obj[embodiment.type.toLowerCase()] = embodiment.properties;
+        });
+        return obj;
+    }
 }

package/src/subsystems/IO/VectorDB.service/connectors/MilvusVectorDB.class.ts

@@ -289,7 +289,7 @@ export class MilvusVectorDB extends VectorDBConnector {
         //const teamId = await this.accountConnector.getCandidateTeam(acRequest.candidate);
         const preparedNs = this.constructNsName(acRequest.candidate as AccessCandidate, namespace);
 
-        const isDeleteByFilter = typeof deleteTarget === 'object';
+        const isDeleteByFilter = typeof deleteTarget === 'object' && !Array.isArray(deleteTarget);
         if (isDeleteByFilter) {
             const supportedFields: SchemaFieldNames[] = ['datasourceId'];
             if (!supportedFields.some((field) => field in deleteTarget)) {

package/src/subsystems/IO/VectorDB.service/connectors/PineconeVectorDB.class.ts

@@ -139,6 +139,7 @@ export class PineconeVectorDB extends VectorDBConnector {
     protected async deleteNamespace(acRequest: AccessRequest, namespace: string): Promise<void> {
         //const teamId = await this.accountConnector.getCandidateTeam(acRequest.candidate);
         //const candidate = AccessCandidate.team(teamId);
+
         const preparedNs = this.constructNsName(acRequest.candidate as AccessCandidate, namespace);
 
         await this.client
@@ -146,6 +147,7 @@ export class PineconeVectorDB extends VectorDBConnector {
             .namespace(this.constructNsName(acRequest.candidate as AccessCandidate, namespace))
             .deleteAll()
             .catch((e) => {
+                console.error(`Error deleting namespace ${namespace}: ${e}`);
                 if (e?.name == 'PineconeNotFoundError') {
                     console.warn(`Namespace ${namespace} does not exist and was requested to be deleted`);
                     return;
@@ -153,6 +155,11 @@ export class PineconeVectorDB extends VectorDBConnector {
                 throw e;
             });
 
+        // delete the linked datasources from nkv
+        await this.nkvConnector
+            .requester(acRequest.candidate as AccessCandidate)
+            .deleteAll(`vectorDB:${this.id}:namespaces:${preparedNs}:datasources`);
+
         await this.deleteACL(AccessCandidate.clone(acRequest.candidate), namespace);
     }
 
@@ -258,7 +265,7 @@ export class PineconeVectorDB extends VectorDBConnector {
 
     @SecureConnector.AccessControl
     protected async delete(acRequest: AccessRequest, namespace: string, deleteTarget: DeleteTarget): Promise<void> {
-        const isDeleteByFilter = typeof deleteTarget === 'object';
+        const isDeleteByFilter = typeof deleteTarget === 'object' && !Array.isArray(deleteTarget);
 
         if (isDeleteByFilter) {
             // TODO: handle delete by filter logic

package/src/subsystems/ObservabilityManager/Telemetry.service/connectors/OTel/OTel.class.ts

@@ -447,6 +447,7 @@ export class OTel extends TelemetryConnector {
                 // nested process has a subID that needs to be removed
                 // a process can be nested if it was called by a parent process : e.g conversation => agent  , agent => sub-agent, agent => forked process ....etc
                 const agentProcessId = agent.agentRuntime.processID;
+                const conversationId = agent.conversationId || agent.agentRequest?.header('X-CONVERSATION-ID');
                 const processId = agentProcessId.split(':').shift();
 
                 const agentId = agent.id;
@@ -462,7 +463,7 @@ export class OTel extends TelemetryConnector {
                 const input = { body, query, headers, processInput: agentInput };
 
                 let convSpan;
-                const ctx = OTelContextRegistry.get(agentId, processId);
+                const ctx = OTelContextRegistry.get(agentId, processId) || OTelContextRegistry.get(agentId, conversationId);
 
                 if (ctx) {
                     convSpan = ctx.rootSpan;

package/src/types/Agent.types.ts

@@ -15,6 +15,8 @@ export type TAgentProcessParams = {
 
 //TODO : refactor & document this interface
 export interface IAgent {
+    //if the agent was triggered from a conversation, this will be the conversation id
+    conversationId: string;
     id: any;
     jobID: any; //forkedAgent
     async: boolean; //forkedAgent