graphai 2.0.11 → 2.0.13

package/lib/bundle.esm.js

@@ -174,7 +174,7 @@ const propNumberFunction = (result, propId) => {
         if (match) {
             return Number(result) + Number(match[1]);
         }
-        const equalMatch = propId.match(/^equal\(([A-Za-z0-9!#$%&()*+,\-./:;<=>?@]+)\)/);
+        const equalMatch = propId.match(/^equal\(([A-Za-z0-9!#$%&()*+,\-/:;<=>?@]+)\)/);
         if (equalMatch) {
             return result === Number(equalMatch[1]);
         }
@@ -189,7 +189,20 @@ const propBooleanFunction = (result, propId) => {
     }
     return undefined;
 };
-const propFunctions = [propArrayFunction, propObjectFunction, propStringFunction, propNumberFunction, propBooleanFunction];
+const propUndefinrdFunction = (result, propId) => {
+    if (result === undefined) {
+        const equalMatch = propId.match(/^default\(([A-Za-z0-9!#$%&()*+,\-/:;<=>?@]+)\)/);
+        if (equalMatch) {
+            if (equalMatch[1].match(/^[0-9-]+$/)) {
+                return Number(equalMatch[1]);
+            }
+            return equalMatch[1];
+        }
+    }
+    return undefined;
+};
+// TODO if (result === undefined) {default()}
+const propFunctions = [propArrayFunction, propObjectFunction, propStringFunction, propNumberFunction, propBooleanFunction, propUndefinrdFunction];
 const utilsFunctions = (input, nodes) => {
     if (input === "@now" || input === "@now_ms") {
         return Date.now();
@@ -365,9 +378,10 @@ const dataSourceNodeIds = (sources) => {
 };
 
 class TransactionLog {
-    constructor(nodeId) {
+    constructor(nodeId, mapIndex) {
         this.nodeId = nodeId;
         this.state = NodeState.Waiting;
+        this.mapIndex = mapIndex;
     }
     initForComputedNode(node, graph) {
         this.agentId = node.getAgentId();
@@ -459,7 +473,7 @@ const getNestedData = (result, propId, propFunctions) => {
     return undefined;
 };
 const innerGetDataFromSource = (result, propIds, propFunctions) => {
-    if (!isNull(result) && propIds && propIds.length > 0) {
+    if (propIds && propIds.length > 0) {
         const propId = propIds[0];
         const ret = getNestedData(result, propId, propFunctions);
         if (ret === undefined) {
@@ -556,7 +570,7 @@ class Node {
         this.result = undefined;
         this.nodeId = nodeId;
         this.graph = graph;
-        this.log = new TransactionLog(nodeId);
+        this.log = new TransactionLog(nodeId, this.graph.mapIndex);
         this.console = {};
     }
     asString() {
@@ -604,6 +618,7 @@ class ComputedNode extends Node {
         this.filterParams = data.filterParams ?? {};
         this.passThrough = data.passThrough;
         this.retryLimit = data.retry ?? graph.retryLimit ?? 0;
+        this.repeatUntil = data.repeatUntil;
         this.timeout = data.timeout;
         this.isResult = data.isResult ?? false;
         this.priority = data.priority ?? 0;
@@ -839,6 +854,14 @@ class ComputedNode extends Node {
                 GraphAILogger.log(`-- transactionId mismatch with ${this.nodeId} (probably timeout)`);
                 return;
             }
+            if (this.repeatUntil?.exists) {
+                const dummyResult = { self: { result: this.getResult(result) } };
+                const repeatResult = resultsOf({ data: this.repeatUntil?.exists }, dummyResult, [], true);
+                if (isNull(repeatResult?.data)) {
+                    this.retry(NodeState.Failed, Error("Repeat Until"));
+                    return;
+                }
+            }
             // after process
             this.afterExecute(result, localLog);
         }
@@ -979,6 +1002,7 @@ const computedNodeAttributeKeys = [
     "anyInput",
     "params",
     "retry",
+    "repeatUntil",
     "timeout",
     "agent",
     "graph",
@@ -1347,6 +1371,7 @@ class GraphAI {
         config: {},
         graphLoader: undefined,
         forceLoop: false,
+        mapIndex: undefined,
     }) {
         this.staticNodeInitData = {};
         this.logs = [];
@@ -1371,6 +1396,7 @@ class GraphAI {
         this.config = options.config;
         this.graphLoader = options.graphLoader;
         this.forceLoop = options.forceLoop ?? false;
+        this.mapIndex = options.mapIndex;
         this.loop = graphData.loop;
         this.verbose = graphData.verbose === true;
         this.onComplete = (__isAbort) => {
@@ -1522,6 +1548,12 @@ class GraphAI {
         if (this.isRunning() || this.processLoopIfNecessary()) {
             return; // continue running
         }
+        if (this.verbose) {
+            const notExecutedNodes = Object.values(this.nodes).filter((node) => node.isComputedNode && node.state !== "completed");
+            if (notExecutedNodes.length > 0) {
+                console.log("Those nodes are not running. " + notExecutedNodes.map((node) => `${node.nodeId}: ${node.state}`).join(", "));
+            }
+        }
         this.onComplete(false); // Nothing to run. Finish it.
     }
     // Must be called only from onExecutionComplete righ after removeRunning
@@ -1622,5 +1654,5 @@ class GraphAI {
     }
 }
 
-export { GraphAI, GraphAILogger, NodeState, TaskManager, ValidationError, agentInfoWrapper, assert, debugResultKey, defaultAgentInfo, defaultConcurrency, defaultTestContext, graphDataLatestVersion, inputs2dataSources, isComputedNodeData, isObject, isStaticNodeData, parseNodeName, sleep, strIntentionalError };
+export { GraphAI, GraphAILogger, NodeState, TaskManager, ValidationError, agentInfoWrapper, assert, debugResultKey, defaultAgentInfo, defaultConcurrency, defaultTestContext, graphDataLatestVersion, inputs2dataSources, isComputedNodeData, isNull, isObject, isStaticNodeData, parseNodeName, sleep, strIntentionalError };
 //# sourceMappingURL=bundle.esm.js.map