graphai 0.6.18 → 0.6.20

package/lib/graphai.d.ts

@@ -6,7 +6,7 @@ export declare const defaultConcurrency = 8;
 export declare const graphDataLatestVersion = 0.5;
 export declare class GraphAI {
     readonly version: number;
-    private readonly graphId;
+    readonly graphId: string;
     private readonly graphData;
     private readonly loop?;
     private readonly logs;
@@ -30,6 +30,7 @@ export declare class GraphAI {
     constructor(graphData: GraphData, agentFunctionInfoDictionary: AgentFunctionInfoDictionary, options?: GraphOptions);
     getAgentFunctionInfo(agentId?: string): import("./type").AgentFunctionInfo | {
         agent: () => Promise<null>;
+        hasGraphData: boolean;
         inputs: null;
         cacheType: undefined;
     };
@@ -41,6 +42,8 @@ export declare class GraphAI {
     pushQueueIfReadyAndRunning(node: ComputedNode): void;
     pushQueue(node: ComputedNode): void;
     run<T = DefaultResultData>(all?: boolean): Promise<ResultDataDictionary<T>>;
+    abort(): void;
+    resetPending(): void;
     isRunning(): boolean;
     onExecutionComplete(node: ComputedNode): void;
     private processLoopIfNecessary;

package/lib/graphai.js

@@ -16,7 +16,7 @@ class GraphAI {
     createNodes(graphData) {
         const nodes = Object.keys(graphData.nodes).reduce((_nodes, nodeId) => {
             const nodeData = graphData.nodes[nodeId];
-            if ("agent" in nodeData) {
+            if ((0, utils_1.isComputedNodeData)(nodeData)) {
                 _nodes[nodeId] = new node_1.ComputedNode(this.graphId, nodeId, nodeData, this);
             }
             else {
@@ -109,7 +109,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()");
         };
         (0, validator_1.validateGraphData)(graphData, [...Object.keys(agentFunctionInfoDictionary), ...this.bypassAgentIds]);
@@ -126,6 +126,7 @@ class GraphAI {
                 agent: async () => {
                     return null;
                 },
+                hasGraphData: false,
                 inputs: null,
                 cacheType: undefined, // for node.getContext
             };
@@ -205,10 +206,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 {
@@ -217,6 +218,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);
@@ -227,7 +241,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.

package/lib/index.d.ts

@@ -2,6 +2,6 @@ export { GraphAI, defaultConcurrency, graphDataLatestVersion } from "./graphai";
 export type { AgentFunction, AgentFunctionInfo, AgentFunctionInfoDictionary, AgentFunctionInfoSample, AgentFunctionContext, GraphData, ResultDataDictionary, ResultData, AgentFilterFunction, AgentFilterInfo, NodeData, StaticNodeData, ComputedNodeData, DefaultResultData, DefaultInputData, DefaultParamsType, GraphDataLoaderOption, GraphDataLoader, ConfigDataDictionary, DefaultConfigData, } from "./type";
 export { NodeState } from "./type";
 export type { TransactionLog } from "./transaction_log";
-export { defaultAgentInfo, agentInfoWrapper, defaultTestContext, strIntentionalError, assert, sleep, isObject, parseNodeName, debugResultKey, } from "./utils/utils";
+export { defaultAgentInfo, agentInfoWrapper, defaultTestContext, strIntentionalError, assert, sleep, isObject, parseNodeName, debugResultKey, isComputedNodeData, isStaticNodeData, } from "./utils/utils";
 export { inputs2dataSources } from "./utils/nodeUtils";
 export { ValidationError } from "./validators/common";

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValidationError = exports.inputs2dataSources = exports.debugResultKey = exports.parseNodeName = exports.isObject = exports.sleep = exports.assert = exports.strIntentionalError = exports.defaultTestContext = exports.agentInfoWrapper = exports.defaultAgentInfo = exports.NodeState = exports.graphDataLatestVersion = exports.defaultConcurrency = exports.GraphAI = void 0;
+exports.ValidationError = exports.inputs2dataSources = exports.isStaticNodeData = exports.isComputedNodeData = exports.debugResultKey = exports.parseNodeName = exports.isObject = exports.sleep = exports.assert = exports.strIntentionalError = exports.defaultTestContext = exports.agentInfoWrapper = exports.defaultAgentInfo = exports.NodeState = exports.graphDataLatestVersion = exports.defaultConcurrency = exports.GraphAI = void 0;
 var graphai_1 = require("./graphai");
 Object.defineProperty(exports, "GraphAI", { enumerable: true, get: function () { return graphai_1.GraphAI; } });
 Object.defineProperty(exports, "defaultConcurrency", { enumerable: true, get: function () { return graphai_1.defaultConcurrency; } });
@@ -17,6 +17,8 @@ Object.defineProperty(exports, "sleep", { enumerable: true, get: function () { r
 Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return utils_1.isObject; } });
 Object.defineProperty(exports, "parseNodeName", { enumerable: true, get: function () { return utils_1.parseNodeName; } });
 Object.defineProperty(exports, "debugResultKey", { enumerable: true, get: function () { return utils_1.debugResultKey; } });
+Object.defineProperty(exports, "isComputedNodeData", { enumerable: true, get: function () { return utils_1.isComputedNodeData; } });
+Object.defineProperty(exports, "isStaticNodeData", { enumerable: true, get: function () { return utils_1.isStaticNodeData; } });
 var nodeUtils_1 = require("./utils/nodeUtils");
 Object.defineProperty(exports, "inputs2dataSources", { enumerable: true, get: function () { return nodeUtils_1.inputs2dataSources; } });
 var common_1 = require("./validators/common");

package/lib/node.d.ts

@@ -38,12 +38,14 @@ export declare class ComputedNode extends Node {
     private unlessSource?;
     private defaultValue?;
     private isSkip;
+    private debugInfo?;
     readonly isStaticNode = false;
     readonly isComputedNode = true;
     constructor(graphId: string, nodeId: string, data: ComputedNodeData, graph: GraphAI);
     getAgentId(): string;
     private getConfig;
     private addPendingNode;
+    resetPending(): void;
     isReadyNode(): boolean;
     private retry;
     private checkDataAvailability;

package/lib/node.js

@@ -126,6 +126,18 @@ class ComputedNode extends Node {
         this.pendings.add(source.nodeId);
         return source;
     }
+    resetPending() {
+        this.pendings.clear();
+        if (this.state === type_1.NodeState.Executing) {
+            this.state = type_1.NodeState.Abort;
+            if (this.debugInfo) {
+                this.debugInfo.state = type_1.NodeState.Abort;
+            }
+        }
+        if (this.debugInfo && this.debugInfo.subGraphs) {
+            this.debugInfo.subGraphs.forEach((graph) => graph.abort());
+        }
+    }
     isReadyNode() {
         if (this.state !== type_1.NodeState.Waiting || this.pendings.size !== 0) {
             return false;
@@ -235,7 +247,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) {
@@ -249,10 +262,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,
@@ -267,7 +284,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)) {
@@ -284,6 +301,9 @@ class ComputedNode extends Node {
         }
     }
     afterExecute(result, localLog) {
+        if (this.state == type_1.NodeState.Abort) {
+            return;
+        }
         this.state = type_1.NodeState.Completed;
         this.result = this.getResult(result);
         if (this.output) {
@@ -323,11 +343,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,
@@ -352,6 +375,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,

package/lib/type.d.ts

@@ -1,5 +1,6 @@
 import type { TransactionLog } from "./transaction_log";
 import type { TaskManager } from "./task_manager";
+import type { GraphAI } from "./graphai";
 export declare enum NodeState {
     Waiting = "waiting",
     Queued = "queued",
@@ -7,6 +8,7 @@ export declare enum NodeState {
     ExecutingServer = "executing-server",
     Failed = "failed",
     TimedOut = "timed-out",
+    Abort = "abort",
     Completed = "completed",
     Injected = "injected",
     Skipped = "skipped"
@@ -85,20 +87,23 @@ export type GraphOptions = {
     graphLoader?: GraphDataLoader;
 };
 export type CacheTypes = "pureAgent" | "impureAgent";
+export type AgentFunctionContextDebugInfo = {
+    verbose: boolean;
+    nodeId: string;
+    state: string;
+    subGraphs: Map<string, GraphAI>;
+    retry: number;
+    agentId?: string;
+    version?: number;
+    isResult?: boolean;
+};
 export type AgentFunctionContext<ParamsType = DefaultParamsType, NamedInputDataType = DefaultInputData, ConfigType = DefaultConfigData> = {
     params: NodeDataParams<ParamsType>;
     inputSchema?: any;
     namedInputs: NamedInputDataType;
-    debugInfo: {
-        verbose: boolean;
-        nodeId: string;
-        retry: number;
-        agentId?: string;
-        version?: number;
-        isResult?: boolean;
-    };
+    debugInfo: AgentFunctionContextDebugInfo;
     forNestedGraph?: {
-        graphData: GraphData;
+        graphData?: GraphData;
         agents: AgentFunctionInfoDictionary;
         graphOptions: GraphOptions;
         onLogCallback?: (log: TransactionLog, isUpdate: boolean) => void;
@@ -142,6 +147,7 @@ export type AgentFunctionInfo = {
     license: string;
     cacheType?: CacheTypes;
     environmentVariables?: string[];
+    hasGraphData?: boolean;
     stream?: boolean;
     apiKeys?: string[];
     npms?: string[];

package/lib/type.js

@@ -9,6 +9,7 @@ var NodeState;
     NodeState["ExecutingServer"] = "executing-server";
     NodeState["Failed"] = "failed";
     NodeState["TimedOut"] = "timed-out";
+    NodeState["Abort"] = "abort";
     NodeState["Completed"] = "completed";
     NodeState["Injected"] = "injected";
     NodeState["Skipped"] = "skipped";

package/lib/utils/utils.d.ts

@@ -1,4 +1,4 @@
-import { DataSource, AgentFunction, DefaultInputData } from "../type";
+import { DataSource, AgentFunction, AgentFunctionInfo, DefaultInputData, NodeData, StaticNodeData, ComputedNodeData, NodeState } from "../type";
 export declare const sleep: (milliseconds: number) => Promise<unknown>;
 export declare const parseNodeName: (inputNodeId: any, isSelfNode?: boolean) => DataSource;
 export declare function assert(condition: boolean, message: string, isWarn?: boolean): asserts condition;
@@ -18,21 +18,7 @@ export declare const defaultAgentInfo: {
     repository: string;
     license: string;
 };
-export declare const agentInfoWrapper: (agent: AgentFunction<any, any, any, any>) => {
-    name: string;
-    samples: {
-        inputs: never[];
-        params: {};
-        result: {};
-    }[];
-    description: string;
-    category: never[];
-    author: string;
-    repository: string;
-    license: string;
-    agent: AgentFunction<any, any, any, any>;
-    mock: AgentFunction<any, any, any, any>;
-};
+export declare const agentInfoWrapper: (agent: AgentFunction<any, any, any, any>) => AgentFunctionInfo;
 export declare const debugResultKey: (agentId: string, result: any) => string[];
 export declare const isLogicallyTrue: (value: any) => boolean;
 export declare const defaultTestContext: {
@@ -40,6 +26,8 @@ export declare const defaultTestContext: {
         nodeId: string;
         retry: number;
         verbose: boolean;
+        state: NodeState;
+        subGraphs: Map<any, any>;
     };
     params: {};
     filterParams: {};
@@ -47,3 +35,5 @@ export declare const defaultTestContext: {
     log: never[];
 };
 export declare const isNamedInputs: <NamedInput = DefaultInputData>(namedInputs: NamedInput) => boolean;
+export declare const isComputedNodeData: (node: NodeData) => node is ComputedNodeData;
+export declare const isStaticNodeData: (node: NodeData) => node is StaticNodeData;

package/lib/utils/utils.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNamedInputs = exports.defaultTestContext = exports.isLogicallyTrue = exports.debugResultKey = exports.agentInfoWrapper = exports.defaultAgentInfo = exports.strIntentionalError = exports.isNull = exports.isObject = exports.parseNodeName = exports.sleep = void 0;
+exports.isStaticNodeData = exports.isComputedNodeData = exports.isNamedInputs = exports.defaultTestContext = exports.isLogicallyTrue = exports.debugResultKey = exports.agentInfoWrapper = exports.defaultAgentInfo = exports.strIntentionalError = exports.isNull = exports.isObject = exports.parseNodeName = exports.sleep = void 0;
 exports.assert = assert;
+const type_1 = require("../type");
 const sleep = async (milliseconds) => {
     return await new Promise((resolve) => setTimeout(resolve, milliseconds));
 };
@@ -118,6 +119,8 @@ exports.defaultTestContext = {
         nodeId: "test",
         retry: 0,
         verbose: true,
+        state: type_1.NodeState.Executing,
+        subGraphs: new Map(),
     },
     params: {},
     filterParams: {},
@@ -128,3 +131,11 @@ const isNamedInputs = (namedInputs) => {
     return (0, exports.isObject)(namedInputs) && !Array.isArray(namedInputs) && Object.keys(namedInputs || {}).length > 0;
 };
 exports.isNamedInputs = isNamedInputs;
+const isComputedNodeData = (node) => {
+    return "agent" in node;
+};
+exports.isComputedNodeData = isComputedNodeData;
+const isStaticNodeData = (node) => {
+    return !("agent" in node);
+};
+exports.isStaticNodeData = isStaticNodeData;

package/lib/validator.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateAgent = exports.validateGraphData = void 0;
+const utils_1 = require("./utils/utils");
 const graph_data_validator_1 = require("./validators/graph_data_validator");
 const nodeValidator_1 = require("./validators/nodeValidator");
 const static_node_validator_1 = require("./validators/static_node_validator");
@@ -16,7 +17,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 = (0, utils_1.isStaticNodeData)(node);
         (0, nodeValidator_1.nodeValidator)(node);
         const agentId = isStaticNode ? "" : node.agent;
         isStaticNode && (0, static_node_validator_1.staticNodeValidator)(node) && staticNodeIds.push(nodeId);

package/lib/validators/relation_validator.js

@@ -24,7 +24,7 @@ const relationValidator = (graphData, staticNodeIds, computedNodeIds) => {
                 }
             });
         };
-        if ("agent" in nodeData && nodeData) {
+        if (nodeData && (0, utils_1.isComputedNodeData)(nodeData)) {
             if (nodeData.inputs) {
                 const sourceNodeIds = (0, nodeUtils_1.dataSourceNodeIds)((0, nodeUtils_1.inputs2dataSources)(nodeData.inputs));
                 dataSourceValidator("Inputs", sourceNodeIds);
@@ -54,7 +54,7 @@ const relationValidator = (graphData, staticNodeIds, computedNodeIds) => {
     // TODO. validate update
     staticNodeIds.forEach((staticNodeId) => {
         const nodeData = graphData.nodes[staticNodeId];
-        if ("value" in nodeData && nodeData.update) {
+        if ((0, utils_1.isStaticNodeData)(nodeData) && nodeData.update) {
             const update = nodeData.update;
             const updateNodeId = (0, utils_1.parseNodeName)(update).nodeId;
             if (!updateNodeId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphai",
-  "version": "0.6.18",
+  "version": "0.6.20",
   "description": "Asynchronous data flow execution engine for agentic AI apps.",
   "main": "lib/bundle.cjs.js",
   "module": "lib/bundle.esm.js",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/receptron/graphai#readme",
   "devDependencies": {
-    "typedoc": "^0.27.5"
+    "typedoc": "^0.27.6"
   },
   "types": "./lib/index.d.ts",
   "directories": {