graphai 1.0.10 → 1.0.12

package/lib/bundle.esm.js

@@ -12,6 +12,55 @@ var NodeState;
     NodeState["Skipped"] = "skipped";
 })(NodeState || (NodeState = {}));
 
+const enabledLevels = {
+    debug: true,
+    info: true,
+    log: true,
+    warn: true,
+    error: true,
+};
+let customLogger = null;
+function setLevelEnabled(level, enabled) {
+    enabledLevels[level] = enabled;
+}
+function setLogger(logger) {
+    customLogger = logger;
+}
+function output(level, ...args) {
+    if (!enabledLevels[level])
+        return;
+    if (customLogger) {
+        customLogger(level, ...args);
+    }
+    else {
+        (console[level] || console.log)(...args);
+    }
+}
+function debug(...args) {
+    output("debug", ...args);
+}
+function info(...args) {
+    output("info", ...args);
+}
+function log(...args) {
+    output("log", ...args);
+}
+function warn(...args) {
+    output("warn", ...args);
+}
+function error(...args) {
+    output("error", ...args);
+}
+const GraphAILogger = {
+    setLevelEnabled,
+    setLogger,
+    debug,
+    info,
+    log,
+    warn,
+    error,
+};
+
 const sleep = async (milliseconds) => {
     return await new Promise((resolve) => setTimeout(resolve, milliseconds));
 };
@@ -42,7 +91,7 @@ function assert(condition, message, isWarn = false) {
         if (!isWarn) {
             throw new Error(message);
         }
-        console.warn("warn: " + message);
+        GraphAILogger.warn("warn: " + message);
     }
 }
 const isObject = (x) => {
@@ -138,6 +187,7 @@ const isComputedNodeData = (node) => {
 const isStaticNodeData = (node) => {
     return !("agent" in node);
 };
+const loopCounterKey = "__loopIndex";
 
 // for dataSource
 const inputs2dataSources = (inputs) => {
@@ -299,7 +349,7 @@ const propStringFunction = (result, propId) => {
             if (sliceMatch[1] !== undefined) {
                 return result.slice(Number(sliceMatch[1]));
             }
-            console.log(sliceMatch);
+            GraphAILogger.warn("slice is not valid format: " + sliceMatch);
         }
         const splitMatch = propId.match(/^split\(([-_:;.,\s\n]+)\)$/);
         if (splitMatch) {
@@ -330,15 +380,18 @@ const propBooleanFunction = (result, propId) => {
     return undefined;
 };
 const propFunctions = [propArrayFunction, propObjectFunction, propStringFunction, propNumberFunction, propBooleanFunction];
-const utilsFunctions = (input) => {
+const utilsFunctions = (input, nodes) => {
     if (input === "@now" || input === "@now_ms") {
         return Date.now();
     }
     if (input === "@now_s") {
         return Math.floor(Date.now() / 1000);
     }
+    if (input === "@loop") {
+        return nodes[loopCounterKey].result;
+    }
     // If a placeholder does not match any key, replace it with an empty string.
-    console.warn("not match template utility function: ${" + input + "}");
+    GraphAILogger.warn("not match template utility function: ${" + input + "}");
     return "";
 };
 
@@ -377,7 +430,7 @@ const innerGetDataFromSource = (result, propIds, propFunctions) => {
         const propId = propIds[0];
         const ret = getNestedData(result, propId, propFunctions);
         if (ret === undefined) {
-            console.error(`prop: ${propIds.join(".")} is not hit`);
+            GraphAILogger.error(`prop: ${propIds.join(".")} is not hit`);
         }
         if (propIds.length > 1) {
             return innerGetDataFromSource(ret, propIds.slice(1), propFunctions);
@@ -400,7 +453,7 @@ const replaceTemplatePlaceholders = (input, templateMatch, nodes, propFunctions,
     const utilsFuncResult = templateMatch
         .filter((text) => text.startsWith("@"))
         .reduce((tmp, key) => {
-        tmp[key] = utilsFunctions(key);
+        tmp[key] = utilsFunctions(key, nodes);
         return tmp;
     }, {});
     return Array.from(templateMatch.keys()).reduce((tmp, key) => {
@@ -491,14 +544,14 @@ class Node {
             return;
         }
         else if (this.console === true || this.console.after === true) {
-            console.log(typeof result === "string" ? result : JSON.stringify(result, null, 2));
+            GraphAILogger.log(typeof result === "string" ? result : JSON.stringify(result, null, 2));
         }
         else if (this.console.after) {
             if (isObject(this.console.after)) {
-                console.log(JSON.stringify(resultsOf(this.console.after, { self: { result } }, this.graph.propFunctions, true), null, 2));
+                GraphAILogger.log(JSON.stringify(resultsOf(this.console.after, { self: { result } }, this.graph.propFunctions, true), null, 2));
             }
             else {
-                console.log(this.console.after);
+                GraphAILogger.log(this.console.after);
             }
         }
     }
@@ -656,7 +709,7 @@ class ComputedNode extends Node {
     // and attempt to retry (if specified).
     executeTimeout(transactionId) {
         if (this.state === NodeState.Executing && this.isCurrentTransaction(transactionId)) {
-            console.warn(`-- timeout ${this.timeout} with ${this.nodeId}`);
+            GraphAILogger.warn(`-- timeout ${this.timeout} with ${this.nodeId}`);
             this.retry(NodeState.TimedOut, Error("Timeout"));
         }
     }
@@ -749,7 +802,7 @@ class ComputedNode extends Node {
             if (!this.isCurrentTransaction(transactionId)) {
                 // This condition happens when the agent function returns
                 // after the timeout (either retried or not).
-                console.log(`-- transactionId mismatch with ${this.nodeId} (probably timeout)`);
+                GraphAILogger.log(`-- transactionId mismatch with ${this.nodeId} (probably timeout)`);
                 return;
             }
             // after process
@@ -787,20 +840,20 @@ class ComputedNode extends Node {
     // the retry if specified.
     errorProcess(error, transactionId, namedInputs) {
         if (error instanceof Error && error.message !== strIntentionalError) {
-            console.error(`<-- NodeId: ${this.nodeId}, Agent: ${this.agentId}`);
-            console.error({ namedInputs });
-            console.error(error);
-            console.error("-->");
+            GraphAILogger.error(`<-- NodeId: ${this.nodeId}, Agent: ${this.agentId}`);
+            GraphAILogger.error({ namedInputs });
+            GraphAILogger.error(error);
+            GraphAILogger.error("-->");
         }
         if (!this.isCurrentTransaction(transactionId)) {
-            console.warn(`-- transactionId mismatch with ${this.nodeId} (not timeout)`);
+            GraphAILogger.warn(`-- transactionId mismatch with ${this.nodeId} (not timeout)`);
             return;
         }
         if (error instanceof Error) {
             this.retry(NodeState.Failed, error);
         }
         else {
-            console.error(`-- NodeId: ${this.nodeId}: Unknown error was caught`);
+            GraphAILogger.error(`-- NodeId: ${this.nodeId}: Unknown error was caught`);
             this.retry(NodeState.Failed, Error("Unknown"));
         }
     }
@@ -848,10 +901,10 @@ class ComputedNode extends Node {
             return;
         }
         else if (this.console === true || this.console.before === true) {
-            console.log(JSON.stringify(context.namedInputs, null, 2));
+            GraphAILogger.log(JSON.stringify(context.namedInputs, null, 2));
         }
         else if (this.console.before) {
-            console.log(this.console.before);
+            GraphAILogger.log(this.console.before);
         }
     }
 }
@@ -1250,15 +1303,14 @@ class GraphAI {
         this.callbacks = [];
         this.repeatCount = 0;
         if (!graphData.version && !options.taskManager) {
-            console.warn("------------ missing version number");
+            GraphAILogger.warn("------------ missing version number");
         }
         this.version = graphData.version ?? graphDataLatestVersion;
         if (this.version < graphDataLatestVersion) {
-            console.warn(`------------ upgrade to ${graphDataLatestVersion}!`);
+            GraphAILogger.warn(`------------ upgrade to ${graphDataLatestVersion}!`);
         }
         this.retryLimit = graphData.retry; // optional
         this.graphId = `${Date.now().toString(36)}-${Math.random().toString(36).substr(2, 9)}`; // URL.createObjectURL(new Blob()).slice(-36);
-        this.graphData = graphData;
         this.agentFunctionInfoDictionary = agentFunctionInfoDictionary;
         this.propFunctions = propFunctions;
         this.taskManager = options.taskManager ?? new TaskManager(graphData.concurrency ?? defaultConcurrency);
@@ -1273,7 +1325,14 @@ class GraphAI {
         };
         validateGraphData(graphData, [...Object.keys(agentFunctionInfoDictionary), ...this.bypassAgentIds]);
         validateAgent(agentFunctionInfoDictionary);
-        this.nodes = this.createNodes(graphData);
+        this.graphData = {
+            ...graphData,
+            nodes: {
+                ...graphData.nodes,
+                [loopCounterKey]: { value: 0, update: `:${loopCounterKey}.add(1)` },
+            },
+        };
+        this.nodes = this.createNodes(this.graphData);
         this.initializeStaticNodes(true);
     }
     getAgentFunctionInfo(agentId) {
@@ -1301,7 +1360,7 @@ class GraphAI {
     // Public API
     results(all) {
         return Object.keys(this.nodes)
-            .filter((nodeId) => all || this.nodes[nodeId].isResult)
+            .filter((nodeId) => (all && nodeId !== loopCounterKey) || this.nodes[nodeId].isResult)
             .reduce((results, nodeId) => {
             const node = this.nodes[nodeId];
             if (node.result !== undefined) {
@@ -1361,7 +1420,7 @@ class GraphAI {
         }
         this.pushReadyNodesIntoQueue();
         if (!this.isRunning()) {
-            console.warn("-- nothing to execute");
+            GraphAILogger.warn("-- nothing to execute");
             return {};
         }
         return new Promise((resolve, reject) => {
@@ -1489,5 +1548,5 @@ class GraphAI {
     }
 }
 
-export { GraphAI, NodeState, ValidationError, agentInfoWrapper, assert, debugResultKey, defaultAgentInfo, defaultConcurrency, defaultTestContext, graphDataLatestVersion, inputs2dataSources, isComputedNodeData, isObject, isStaticNodeData, parseNodeName, sleep, strIntentionalError };
+export { GraphAI, GraphAILogger, NodeState, ValidationError, agentInfoWrapper, assert, debugResultKey, defaultAgentInfo, defaultConcurrency, defaultTestContext, graphDataLatestVersion, inputs2dataSources, isComputedNodeData, isObject, isStaticNodeData, parseNodeName, sleep, strIntentionalError };
 //# sourceMappingURL=bundle.esm.js.map