@smythos/sre 1.7.1 → 1.7.5

package/src/Core/SmythRuntime.class.ts

@@ -9,6 +9,8 @@ import pkg from '../../package.json';
 
 const logger = Logger('SRE');
 
+const SRE_GLOBAL_KEY = Symbol.for('SRE@singleton');
+
 export class SmythRuntime {
     public started = false;
 
@@ -84,10 +86,19 @@ export class SmythRuntime {
     }
 
     protected static instance?: SmythRuntime;
+    // public static get Instance(): SmythRuntime {
+    //     if (!SmythRuntime.instance) {
+    //         SmythRuntime.instance = new SmythRuntime();
+    //     }
+    //     return SmythRuntime.instance;
+    // }
+
     public static get Instance(): SmythRuntime {
-        if (!SmythRuntime.instance) {
-            SmythRuntime.instance = new SmythRuntime();
+        if (global[SRE_GLOBAL_KEY]) {
+            return global[SRE_GLOBAL_KEY];
         }
+        SmythRuntime.instance = new SmythRuntime();
+        global[SRE_GLOBAL_KEY] = SmythRuntime.instance;
         return SmythRuntime.instance;
     }
 

package/src/helpers/BinaryInput.helper.ts

@@ -23,7 +23,7 @@ export class BinaryInput {
         data: BinaryInput | Buffer | ArrayBuffer | Blob | string | Record<string, any>,
         private _name?: string,
         public mimetype?: string,
-        private candidate?: IAccessCandidate,
+        private candidate?: IAccessCandidate
     ) {
         if (!_name) _name = uid();
         this._name = _name;
@@ -97,6 +97,9 @@ export class BinaryInput {
                     this._ready = true;
                 }
             } else {
+                //try to guess the mimetype from the url extension
+                const ext = this.url.split('.').pop();
+                this.mimetype = mime.getType(ext) || '';
                 this._ready = true;
             }
             return;
@@ -205,8 +208,6 @@ export class BinaryInput {
             this._ready = true;
             return;
         }
-
-        
     }
 
     private async getUrlInfo(url) {
@@ -221,9 +222,9 @@ export class BinaryInput {
         }
     }
 
-    public static from(data, name?: string, mimetype?: string, candidate?: IAccessCandidate) {
-        if (data instanceof BinaryInput) return data;
-        return new BinaryInput(data, name, mimetype, candidate);
+    public static from(source, name?: string, mimetype?: string, candidate?: IAccessCandidate) {
+        if (source instanceof BinaryInput) return source;
+        return new BinaryInput(source, name, mimetype, candidate);
     }
 
     public async upload(candidate: IAccessCandidate, ttl?: number) {
@@ -239,8 +240,7 @@ export class BinaryInput {
                 this.url = `smythfs://${teamId}.team/${candidate.id}/_temp/${this._name}`;
                 await SmythFS.Instance.write(this.url, this._source, candidate, undefined, ttl);
                 this._uploading = false;
-            }
-            else {
+            } else {
                 this._uploading = false;
             }
         } catch (error) {

package/src/helpers/Conversation.helper.ts

@@ -224,6 +224,7 @@ export class Conversation extends EventEmitter {
             teamId: instance._teamId,
             agentId: instance._agentId,
             model: instance._model,
+            agentData: instance.agentData,
         };
     })
     public async prompt(message?: string | any, toolHeaders = {}, concurrentToolCalls = 4, abortSignal?: AbortSignal) {
@@ -250,6 +251,7 @@ export class Conversation extends EventEmitter {
             teamId: instance._teamId,
             agentId: instance._agentId,
             model: instance._model,
+            agentData: instance.agentData,
         };
     })
     public async streamPrompt(message?: string | any, toolHeaders = {}, concurrentToolCalls = 4, abortSignal?: AbortSignal) {
@@ -402,6 +404,11 @@ export class Conversation extends EventEmitter {
                     llmMessage.thinkingBlocks = thinkingBlocks;
                 }
 
+                //add tool status for every tool entry
+                toolsData.forEach((tool) => {
+                    tool.status = tool.name ? this._toolStatusMap?.[tool.name] : undefined;
+                });
+
                 llmMessage.tool_calls = toolsData.map((tool) => {
                     return {
                         id: tool.id,
@@ -678,7 +685,10 @@ export class Conversation extends EventEmitter {
                 const requiresRemoteCall =
                     reqConfig.headers['X-DEBUG'] !== undefined ||
                     reqConfig.headers['X-MONITOR-ID'] !== undefined ||
-                    reqConfig.headers['X-AGENT-REMOTE-CALL'] !== undefined;
+                    //This is used for cases that requre to inject a default attachment handler
+                    //TODO : this need to be removed from the conversation helper in the future since default attachment handler is a specific server feature
+                    //reqConfig.headers['X-AGENT-HAS-ATTACHMENTS'] !== undefined;
+                    reqConfig.headers['x-conversation-id'] !== undefined;
 
                 if (canRunLocally && !requiresRemoteCall) {
                     console.log('RUNNING AGENT LOCALLY');

package/src/helpers/LocalCache.helper.ts

@@ -3,6 +3,13 @@ interface CacheItem<T> {
     expiry: number;
 }
 
+/**
+ * A local cache helper used to cache data, functions or object instances
+ * This is useful when you need to cache an object and refresh the cache if the object is accessed within a certain time period
+ *
+ * @template K - The type of the key
+ * @template V - The type of the value
+ */
 export class LocalCache<K, V> {
     private cache: Map<K, V>;
     private expiryMap: Map<K, number>;
@@ -48,6 +55,12 @@ export class LocalCache<K, V> {
         timeout.unref(); //unblock the event loop
     }
 
+    /**
+     * Get the value from the cache, and update the TTL if provided
+     * @param key - The key to get the value from the cache
+     * @param ttlMs - The TTL in milliseconds
+     * @returns The value from the cache
+     */
     get(key: K, ttlMs?: number): V | undefined {
         if (!this.has(key)) {
             return undefined;
@@ -60,6 +73,11 @@ export class LocalCache<K, V> {
         return value;
     }
 
+    /**
+     * Check if the key exists in the cache
+     * @param key - The key to check if it exists in the cache
+     * @returns True if the key exists in the cache, false otherwise
+     */
     has(key: K): boolean {
         if (!this.cache.has(key)) {
             return false;

package/src/helpers/TemplateString.helper.ts

@@ -101,19 +101,30 @@ export class TemplateStringHelper {
     /**
      * Parses a template string by replacing the placeholders with the values from the provided data object
      * unmatched placeholders will be left as is
+     * Recursively resolves nested template variables until no more variables are found
      */
-    public parse(data: Record<string, string>, regex: TemplateStringMatch = Match.default) {
+    public parse(data: Record<string, string>, regex: TemplateStringMatch = Match.default, maxDepth: number = 5) {
         if (typeof this._current !== 'string' || typeof data !== 'object') return this;
-        this._current = this._current.replace(regex, (match, token) => {
-            let val = data?.[token] ?? match; // Use nullish coalescing to preserve falsy values (0, '', false)
 
-            //if no exact match, try to parse the token as a JSON expression
-            if (!data?.[token]) {
-                val = JSONExpression(data, token) || `{{${token}}}`; //if no match, use the token as is
-            }
+        // Keep parsing until no more template variables are resolved or max depth is reached
+        // this is useful for chained template variables : e.g {{defaultVar}} => "text {{nestedVar}} more text" ==> "text value of nestedVar more text"
+        for (let i = 0; i < maxDepth; i++) {
+            const previous = this._current;
 
-            return typeof val === 'object' ? JSON.stringify(val) : escapeJsonField(val);
-        });
+            this._current = this._current.replace(regex, (match, token) => {
+                let val = data?.[token] ?? match; // Use nullish coalescing to preserve falsy values (0, '', false)
+
+                //if no exact match, try to parse the token as a JSON expression
+                if (!data?.[token]) {
+                    val = JSONExpression(data, token) || `{{${token}}}`; //if no match, use the token as is
+                }
+
+                return typeof val === 'object' ? JSON.stringify(val) : escapeJsonField(val);
+            });
+
+            // Break early if no changes were made : we parsed all the template variables
+            if (previous === this._current) break;
+        }
 
         return this;
     }