graphai 0.6.18 → 0.6.20

package/lib/bundle.esm.js

@@ -1,3 +1,17 @@
+var NodeState;
+(function (NodeState) {
+    NodeState["Waiting"] = "waiting";
+    NodeState["Queued"] = "queued";
+    NodeState["Executing"] = "executing";
+    NodeState["ExecutingServer"] = "executing-server";
+    NodeState["Failed"] = "failed";
+    NodeState["TimedOut"] = "timed-out";
+    NodeState["Abort"] = "abort";
+    NodeState["Completed"] = "completed";
+    NodeState["Injected"] = "injected";
+    NodeState["Skipped"] = "skipped";
+})(NodeState || (NodeState = {}));
+
 const sleep = async (milliseconds) => {
     return await new Promise((resolve) => setTimeout(resolve, milliseconds));
 };
@@ -107,6 +121,8 @@ const defaultTestContext = {
         nodeId: "test",
         retry: 0,
         verbose: true,
+        state: NodeState.Executing,
+        subGraphs: new Map(),
     },
     params: {},
     filterParams: {},
@@ -116,6 +132,12 @@ const defaultTestContext = {
 const isNamedInputs = (namedInputs) => {
     return isObject(namedInputs) && !Array.isArray(namedInputs) && Object.keys(namedInputs || {}).length > 0;
 };
+const isComputedNodeData = (node) => {
+    return "agent" in node;
+};
+const isStaticNodeData = (node) => {
+    return !("agent" in node);
+};
 
 // for dataSource
 const inputs2dataSources = (inputs) => {
@@ -139,19 +161,6 @@ const dataSourceNodeIds = (sources) => {
     return sources.filter((source) => source.nodeId).map((source) => source.nodeId);
 };
 
-var NodeState;
-(function (NodeState) {
-    NodeState["Waiting"] = "waiting";
-    NodeState["Queued"] = "queued";
-    NodeState["Executing"] = "executing";
-    NodeState["ExecutingServer"] = "executing-server";
-    NodeState["Failed"] = "failed";
-    NodeState["TimedOut"] = "timed-out";
-    NodeState["Completed"] = "completed";
-    NodeState["Injected"] = "injected";
-    NodeState["Skipped"] = "skipped";
-})(NodeState || (NodeState = {}));
-
 class TransactionLog {
     constructor(nodeId) {
         this.nodeId = nodeId;
@@ -533,6 +542,18 @@ class ComputedNode extends Node {
         this.pendings.add(source.nodeId);
         return source;
     }
+    resetPending() {
+        this.pendings.clear();
+        if (this.state === NodeState.Executing) {
+            this.state = NodeState.Abort;
+            if (this.debugInfo) {
+                this.debugInfo.state = NodeState.Abort;
+            }
+        }
+        if (this.debugInfo && this.debugInfo.subGraphs) {
+            this.debugInfo.subGraphs.forEach((graph) => graph.abort());
+        }
+    }
     isReadyNode() {
         if (this.state !== NodeState.Waiting || this.pendings.size !== 0) {
             return false;
@@ -642,7 +663,8 @@ class ComputedNode extends Node {
         if (typeof agentId === "function") {
             this.agentFunction = agentId;
         }
-        const config = this.getConfig(!!this.nestedGraph, agentId);
+        const hasNestedGraph = Boolean(this.nestedGraph) || Boolean(agentId && this.graph.getAgentFunctionInfo(agentId).hasGraphData);
+        const config = this.getConfig(hasNestedGraph, agentId);
         const transactionId = Date.now();
         this.prepareExecute(transactionId, Object.values(previousResults));
         if (this.timeout && this.timeout > 0) {
@@ -656,10 +678,14 @@ class ComputedNode extends Node {
             const context = this.getContext(previousResults, localLog, agentId, config);
             // NOTE: We use the existence of graph object in the agent-specific params to determine
             // if this is a nested agent or not.
-            if (this.nestedGraph) {
+            if (hasNestedGraph) {
                 this.graph.taskManager.prepareForNesting();
                 context.forNestedGraph = {
-                    graphData: "nodes" in this.nestedGraph ? this.nestedGraph : this.graph.resultOf(this.nestedGraph), // HACK: compiler work-around
+                    graphData: this.nestedGraph
+                        ? "nodes" in this.nestedGraph
+                            ? this.nestedGraph
+                            : this.graph.resultOf(this.nestedGraph) // HACK: compiler work-around
+                        : { version: 0, nodes: {} },
                     agents: this.graph.agentFunctionInfoDictionary,
                     graphOptions: {
                         agentFilters: this.graph.agentFilters,
@@ -674,7 +700,7 @@ class ComputedNode extends Node {
             this.beforeConsoleLog(context);
             const result = await this.agentFilterHandler(context, agentFunction, agentId);
             this.afterConsoleLog(result);
-            if (this.nestedGraph) {
+            if (hasNestedGraph) {
                 this.graph.taskManager.restoreAfterNesting();
             }
             if (!this.isCurrentTransaction(transactionId)) {
@@ -691,6 +717,9 @@ class ComputedNode extends Node {
         }
     }
     afterExecute(result, localLog) {
+        if (this.state == NodeState.Abort) {
+            return;
+        }
         this.state = NodeState.Completed;
         this.result = this.getResult(result);
         if (this.output) {
@@ -730,11 +759,14 @@ class ComputedNode extends Node {
         }
     }
     getContext(previousResults, localLog, agentId, config) {
+        // Pass debugInfo by reference, and the state of this node will be received by agent/agentFilter.
+        // From graphAgent(nested, map), set the instance of graphai, and use abort on the child graphai.
+        this.debugInfo = this.getDebugInfo(agentId);
         const context = {
             params: this.graph.resultsOf(this.params),
             namedInputs: previousResults,
             inputSchema: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(agentId)?.inputs,
-            debugInfo: this.getDebugInfo(agentId),
+            debugInfo: this.debugInfo,
             cacheType: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(agentId)?.cacheType,
             filterParams: this.filterParams,
             agentFilters: this.graph.agentFilters,
@@ -759,6 +791,8 @@ class ComputedNode extends Node {
             nodeId: this.nodeId,
             agentId,
             retry: this.retryCount,
+            state: this.state,
+            subGraphs: new Map(),
             verbose: this.graph.verbose,
             version: this.graph.version,
             isResult: this.isResult,
@@ -912,7 +946,7 @@ const relationValidator = (graphData, staticNodeIds, computedNodeIds) => {
                 }
             });
         };
-        if ("agent" in nodeData && nodeData) {
+        if (nodeData && isComputedNodeData(nodeData)) {
             if (nodeData.inputs) {
                 const sourceNodeIds = dataSourceNodeIds(inputs2dataSources(nodeData.inputs));
                 dataSourceValidator("Inputs", sourceNodeIds);
@@ -942,7 +976,7 @@ const relationValidator = (graphData, staticNodeIds, computedNodeIds) => {
     // TODO. validate update
     staticNodeIds.forEach((staticNodeId) => {
         const nodeData = graphData.nodes[staticNodeId];
-        if ("value" in nodeData && nodeData.update) {
+        if (isStaticNodeData(nodeData) && nodeData.update) {
             const update = nodeData.update;
             const updateNodeId = parseNodeName(update).nodeId;
             if (!updateNodeId) {
@@ -998,7 +1032,7 @@ const validateGraphData = (data, agentIds) => {
     const graphAgentIds = new Set();
     Object.keys(data.nodes).forEach((nodeId) => {
         const node = data.nodes[nodeId];
-        const isStaticNode = !("agent" in node);
+        const isStaticNode = isStaticNodeData(node);
         nodeValidator(node);
         const agentId = isStaticNode ? "" : node.agent;
         isStaticNode && staticNodeValidator(node) && staticNodeIds.push(nodeId);
@@ -1095,7 +1129,7 @@ class GraphAI {
     createNodes(graphData) {
         const nodes = Object.keys(graphData.nodes).reduce((_nodes, nodeId) => {
             const nodeData = graphData.nodes[nodeId];
-            if ("agent" in nodeData) {
+            if (isComputedNodeData(nodeData)) {
                 _nodes[nodeId] = new ComputedNode(this.graphId, nodeId, nodeData, this);
             }
             else {
@@ -1188,7 +1222,7 @@ class GraphAI {
         this.graphLoader = options.graphLoader;
         this.loop = graphData.loop;
         this.verbose = graphData.verbose === true;
-        this.onComplete = () => {
+        this.onComplete = (__isAbort) => {
             throw new Error("SOMETHING IS WRONG: onComplete is called without run()");
         };
         validateGraphData(graphData, [...Object.keys(agentFunctionInfoDictionary), ...this.bypassAgentIds]);
@@ -1205,6 +1239,7 @@ class GraphAI {
                 agent: async () => {
                     return null;
                 },
+                hasGraphData: false,
                 inputs: null,
                 cacheType: undefined, // for node.getContext
             };
@@ -1284,10 +1319,10 @@ class GraphAI {
             return {};
         }
         return new Promise((resolve, reject) => {
-            this.onComplete = () => {
+            this.onComplete = (isAbort = false) => {
                 const errors = this.errors();
                 const nodeIds = Object.keys(errors);
-                if (nodeIds.length > 0) {
+                if (nodeIds.length > 0 || isAbort) {
                     reject(errors[nodeIds[0]]);
                 }
                 else {
@@ -1296,6 +1331,19 @@ class GraphAI {
             };
         });
     }
+    abort() {
+        if (this.isRunning()) {
+            this.resetPending();
+        }
+        this.onComplete(this.isRunning());
+    }
+    resetPending() {
+        Object.values(this.nodes).map((node) => {
+            if (node.isComputedNode) {
+                node.resetPending();
+            }
+        });
+    }
     // Public only for testing
     isRunning() {
         return this.taskManager.isRunning(this.graphId);
@@ -1306,7 +1354,7 @@ class GraphAI {
         if (this.isRunning() || this.processLoopIfNecessary()) {
             return; // continue running
         }
-        this.onComplete(); // Nothing to run. Finish it.
+        this.onComplete(false); // Nothing to run. Finish it.
     }
     // Must be called only from onExecutionComplete righ after removeRunning
     // Check if there is any running computed nodes.
@@ -1383,5 +1431,5 @@ class GraphAI {
     }
 }
 
-export { GraphAI, NodeState, ValidationError, agentInfoWrapper, assert, debugResultKey, defaultAgentInfo, defaultConcurrency, defaultTestContext, graphDataLatestVersion, inputs2dataSources, isObject, parseNodeName, sleep, strIntentionalError };
+export { GraphAI, NodeState, ValidationError, agentInfoWrapper, assert, debugResultKey, defaultAgentInfo, defaultConcurrency, defaultTestContext, graphDataLatestVersion, inputs2dataSources, isComputedNodeData, isObject, isStaticNodeData, parseNodeName, sleep, strIntentionalError };
 //# sourceMappingURL=bundle.esm.js.map