graphai 0.6.8 → 0.6.10

package/lib/graphai.js

@@ -13,9 +13,9 @@ exports.graphDataLatestVersion = 0.5;
 class GraphAI {
     // This method is called when either the GraphAI obect was created,
     // or we are about to start n-th iteration (n>2).
-    createNodes(data) {
-        const nodes = Object.keys(data.nodes).reduce((_nodes, nodeId) => {
-            const nodeData = data.nodes[nodeId];
+    createNodes(graphData) {
+        const nodes = Object.keys(graphData.nodes).reduce((_nodes, nodeId) => {
+            const nodeData = graphData.nodes[nodeId];
             if ("agent" in nodeData) {
                 _nodes[nodeId] = new node_1.ComputedNode(this.graphId, nodeId, nodeData, this);
             }
@@ -48,7 +48,7 @@ class GraphAI {
         // If the result property is specified, inject it.
         // If the previousResults exists (indicating we are in a loop),
         // process the update property (nodeId or nodeId.propId).
-        Object.keys(this.data.nodes).forEach((nodeId) => {
+        Object.keys(this.graphData.nodes).forEach((nodeId) => {
             const node = this.nodes[nodeId];
             if (node?.isStaticNode) {
                 const value = node?.value;
@@ -65,7 +65,7 @@ class GraphAI {
         // If the result property is specified, inject it.
         // If the previousResults exists (indicating we are in a loop),
         // process the update property (nodeId or nodeId.propId).
-        Object.keys(this.data.nodes).forEach((nodeId) => {
+        Object.keys(this.graphData.nodes).forEach((nodeId) => {
             const node = this.nodes[nodeId];
             if (node?.isStaticNode) {
                 const update = node?.update;
@@ -79,7 +79,7 @@ class GraphAI {
             }
         });
     }
-    constructor(data, agentFunctionInfoDictionary, options = {
+    constructor(graphData, agentFunctionInfoDictionary, options = {
         taskManager: undefined,
         agentFilters: [],
         bypassAgentIds: [],
@@ -90,30 +90,31 @@ class GraphAI {
         this.config = {};
         this.onLogCallback = (__log, __isUpdate) => { };
         this.repeatCount = 0;
-        if (!data.version && !options.taskManager) {
+        if (!graphData.version && !options.taskManager) {
             console.warn("------------ missing version number");
         }
-        this.version = data.version ?? exports.graphDataLatestVersion;
+        this.version = graphData.version ?? exports.graphDataLatestVersion;
         if (this.version < exports.graphDataLatestVersion) {
             console.warn(`------------ upgrade to ${exports.graphDataLatestVersion}!`);
         }
-        this.retryLimit = data.retry; // optional
+        this.retryLimit = graphData.retry; // optional
         this.graphId = URL.createObjectURL(new Blob()).slice(-36);
-        this.data = data;
+        this.graphData = graphData;
         this.agentFunctionInfoDictionary = agentFunctionInfoDictionary;
         this.propFunctions = prop_function_1.propFunctions;
-        this.taskManager = options.taskManager ?? new task_manager_1.TaskManager(data.concurrency ?? exports.defaultConcurrency);
+        this.taskManager = options.taskManager ?? new task_manager_1.TaskManager(graphData.concurrency ?? exports.defaultConcurrency);
         this.agentFilters = options.agentFilters ?? [];
         this.bypassAgentIds = options.bypassAgentIds ?? [];
         this.config = options.config;
         this.graphLoader = options.graphLoader;
-        this.loop = data.loop;
-        this.verbose = data.verbose === true;
+        this.loop = graphData.loop;
+        this.verbose = graphData.verbose === true;
         this.onComplete = () => {
             throw new Error("SOMETHING IS WRONG: onComplete is called without run()");
         };
-        (0, validator_1.validateGraphData)(data, [...Object.keys(agentFunctionInfoDictionary), ...this.bypassAgentIds]);
-        this.nodes = this.createNodes(data);
+        (0, validator_1.validateGraphData)(graphData, [...Object.keys(agentFunctionInfoDictionary), ...this.bypassAgentIds]);
+        (0, validator_1.validateAgent)(agentFunctionInfoDictionary);
+        this.nodes = this.createNodes(graphData);
         this.initializeStaticNodes(true);
     }
     getAgentFunctionInfo(agentId) {
@@ -260,7 +261,7 @@ class GraphAI {
         if (this.isRunning()) {
             throw new Error("This GraphAI instance is running");
         }
-        this.nodes = this.createNodes(this.data);
+        this.nodes = this.createNodes(this.graphData);
         this.initializeStaticNodes();
     }
     setPreviousResults(previousResults) {

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 export { GraphAI, defaultConcurrency, graphDataLatestVersion } from "./graphai";
 export { AgentFunction, AgentFunctionInfo, AgentFunctionInfoDictionary, AgentFunctionInfoSample, AgentFunctionContext, GraphData, ResultDataDictionary, ResultData, NodeState, AgentFilterFunction, AgentFilterInfo, NodeData, StaticNodeData, ComputedNodeData, DefaultResultData, DefaultInputData, DefaultParamsType, GraphDataLoaderOption, GraphDataLoader, } from "./type";
 export type { TransactionLog } from "./transaction_log";
-export { defaultAgentInfo, agentInfoWrapper, defaultTestContext, strIntentionalError, assert, sleep, isObject, parseNodeName } from "./utils/utils";
+export { defaultAgentInfo, agentInfoWrapper, defaultTestContext, strIntentionalError, assert, sleep, isObject, parseNodeName, debugResultKey, } 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.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.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; } });
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "assert", { enumerable: true, get: function () {
 Object.defineProperty(exports, "sleep", { enumerable: true, get: function () { return utils_1.sleep; } });
 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; } });
 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.js

@@ -40,7 +40,7 @@ class Node {
         }
         else if (this.console.after) {
             if ((0, utils_2.isObject)(this.console.after)) {
-                console.log(JSON.stringify((0, result_1.resultsOf)(this.console.after, { self: this }, this.graph.propFunctions, true), null, 2));
+                console.log(JSON.stringify((0, result_1.resultsOf)(this.console.after, { self: { result } }, this.graph.propFunctions, true), null, 2));
             }
             else {
                 console.log(this.console.after);
@@ -66,14 +66,6 @@ class ComputedNode extends Node {
         this.timeout = data.timeout;
         this.isResult = data.isResult ?? false;
         this.priority = data.priority ?? 0;
-        this.anyInput = data.anyInput ?? false;
-        this.inputs = data.inputs;
-        this.output = data.output;
-        this.dataSources = [...(data.inputs ? (0, nodeUtils_1.inputs2dataSources)(data.inputs).flat(10) : []), ...(data.params ? (0, nodeUtils_1.inputs2dataSources)(data.params).flat(10) : [])];
-        if (data.inputs && Array.isArray(data.inputs)) {
-            throw new Error(`array inputs have been deprecated. nodeId: ${nodeId}: see https://github.com/receptron/graphai/blob/main/docs/NamedInputs.md`);
-        }
-        this.pendings = new Set((0, nodeUtils_1.dataSourceNodeIds)(this.dataSources));
         (0, utils_2.assert)(["function", "string"].includes(typeof data.agent), "agent must be either string or function");
         if (typeof data.agent === "string") {
             this.agentId = data.agent;
@@ -82,6 +74,18 @@ class ComputedNode extends Node {
             const agent = data.agent;
             this.agentFunction = async ({ namedInputs, params }) => agent(namedInputs, params);
         }
+        this.anyInput = data.anyInput ?? false;
+        this.inputs = data.inputs;
+        this.output = data.output;
+        this.dataSources = [
+            ...(data.inputs ? (0, nodeUtils_1.inputs2dataSources)(data.inputs).flat(10) : []),
+            ...(data.params ? (0, nodeUtils_1.inputs2dataSources)(data.params).flat(10) : []),
+            ...(this.agentId ? [(0, utils_2.parseNodeName)(this.agentId)] : []),
+        ];
+        if (data.inputs && Array.isArray(data.inputs)) {
+            throw new Error(`array inputs have been deprecated. nodeId: ${nodeId}: see https://github.com/receptron/graphai/blob/main/docs/NamedInputs.md`);
+        }
+        this.pendings = new Set((0, nodeUtils_1.dataSourceNodeIds)(this.dataSources));
         if (data.graph) {
             this.nestedGraph = typeof data.graph === "string" ? this.addPendingNode(data.graph) : data.graph;
         }
@@ -174,9 +178,9 @@ class ComputedNode extends Node {
         }
     }
     // Check if we need to apply this filter to this node or not.
-    shouldApplyAgentFilter(agentFilter) {
+    shouldApplyAgentFilter(agentFilter, agentId) {
         if (agentFilter.agentIds && Array.isArray(agentFilter.agentIds) && agentFilter.agentIds.length > 0) {
-            if (this.agentId && agentFilter.agentIds.includes(this.agentId)) {
+            if (agentId && agentFilter.agentIds.includes(agentId)) {
                 return true;
             }
         }
@@ -187,12 +191,12 @@ class ComputedNode extends Node {
         }
         return !agentFilter.agentIds && !agentFilter.nodeIds;
     }
-    agentFilterHandler(context, agentFunction) {
+    agentFilterHandler(context, agentFunction, agentId) {
         let index = 0;
         const next = (innerContext) => {
             const agentFilter = this.graph.agentFilters[index++];
             if (agentFilter) {
-                if (this.shouldApplyAgentFilter(agentFilter)) {
+                if (this.shouldApplyAgentFilter(agentFilter, agentId)) {
                     if (agentFilter.filterParams) {
                         innerContext.filterParams = { ...agentFilter.filterParams, ...innerContext.filterParams };
                     }
@@ -214,6 +218,7 @@ class ComputedNode extends Node {
             return;
         }
         const previousResults = this.graph.resultsOf(this.inputs, this.anyInput);
+        const agentId = this.agentId ? this.graph.resultOf((0, utils_2.parseNodeName)(this.agentId)) : this.agentId;
         const transactionId = Date.now();
         this.prepareExecute(transactionId, Object.values(previousResults));
         if (this.timeout && this.timeout > 0) {
@@ -222,9 +227,9 @@ class ComputedNode extends Node {
             }, this.timeout);
         }
         try {
-            const agentFunction = this.agentFunction ?? this.graph.getAgentFunctionInfo(this.agentId).agent;
+            const agentFunction = this.agentFunction ?? this.graph.getAgentFunctionInfo(agentId).agent;
             const localLog = [];
-            const context = this.getContext(previousResults, localLog);
+            const context = this.getContext(previousResults, localLog, agentId);
             // 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) {
@@ -243,7 +248,7 @@ class ComputedNode extends Node {
                 };
             }
             this.beforeConsoleLog(context);
-            const result = await this.agentFilterHandler(context, agentFunction);
+            const result = await this.agentFilterHandler(context, agentFunction, agentId);
             this.afterConsoleLog(result);
             if (this.nestedGraph) {
                 this.graph.taskManager.restoreAfterNesting();
@@ -300,13 +305,13 @@ class ComputedNode extends Node {
             this.retry(type_1.NodeState.Failed, Error("Unknown"));
         }
     }
-    getContext(previousResults, localLog) {
+    getContext(previousResults, localLog, agentId) {
         const context = {
             params: this.graph.resultsOf(this.params),
             namedInputs: previousResults,
-            inputSchema: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(this.agentId)?.inputs,
-            debugInfo: this.getDebugInfo(),
-            cacheType: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(this.agentId)?.cacheType,
+            inputSchema: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(agentId)?.inputs,
+            debugInfo: this.getDebugInfo(agentId),
+            cacheType: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(agentId)?.cacheType,
             filterParams: this.filterParams,
             agentFilters: this.graph.agentFilters,
             config: this.graph.config,
@@ -325,10 +330,10 @@ class ComputedNode extends Node {
         }
         return result;
     }
-    getDebugInfo() {
+    getDebugInfo(agentId) {
         return {
             nodeId: this.nodeId,
-            agentId: this.agentId,
+            agentId,
             retry: this.retryCount,
             verbose: this.graph.verbose,
             version: this.graph.version,

package/lib/validator.d.ts

@@ -1,2 +1,3 @@
-import { GraphData } from "./type";
+import { GraphData, AgentFunctionInfoDictionary } from "./type";
 export declare const validateGraphData: (data: GraphData, agentIds: string[]) => boolean;
+export declare const validateAgent: (agentFunctionInfoDictionary: AgentFunctionInfoDictionary) => void;

package/lib/validator.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateGraphData = void 0;
+exports.validateAgent = exports.validateGraphData = void 0;
 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");
 const computed_node_validator_1 = require("./validators/computed_node_validator");
 const relation_validator_1 = require("./validators/relation_validator");
 const agent_validator_1 = require("./validators/agent_validator");
+const common_1 = require("./validators/common");
 const validateGraphData = (data, agentIds) => {
     (0, graph_data_validator_1.graphNodesValidator)(data);
     (0, graph_data_validator_1.graphDataValidator)(data);
@@ -26,3 +27,14 @@ const validateGraphData = (data, agentIds) => {
     return true;
 };
 exports.validateGraphData = validateGraphData;
+const validateAgent = (agentFunctionInfoDictionary) => {
+    Object.keys(agentFunctionInfoDictionary).forEach((agentId) => {
+        if (agentId !== "default") {
+            const agentInfo = agentFunctionInfoDictionary[agentId];
+            if (!agentInfo || !agentInfo.agent) {
+                throw new common_1.ValidationError("No Agent: " + agentId + " is not in AgentFunctionInfoDictionary.");
+            }
+        }
+    });
+};
+exports.validateAgent = validateAgent;

package/lib/validators/agent_validator.js

@@ -4,7 +4,8 @@ exports.agentValidator = void 0;
 const common_1 = require("../validators/common");
 const agentValidator = (graphAgentIds, agentIds) => {
     graphAgentIds.forEach((agentId) => {
-        if (!agentIds.has(agentId)) {
+        // agentId or dynamic agentId
+        if (!agentIds.has(agentId) && agentId[0] !== ":") {
             throw new common_1.ValidationError("Invalid Agent : " + agentId + " is not in AgentFunctionInfoDictionary.");
         }
     });

package/lib/validators/relation_validator.d.ts

@@ -1,2 +1,2 @@
 import { GraphData } from "../type";
-export declare const relationValidator: (data: GraphData, staticNodeIds: string[], computedNodeIds: string[]) => void;
+export declare const relationValidator: (graphData: GraphData, staticNodeIds: string[], computedNodeIds: string[]) => void;

package/lib/validators/relation_validator.js

@@ -4,13 +4,13 @@ exports.relationValidator = void 0;
 const utils_1 = require("../utils/utils");
 const common_1 = require("../validators/common");
 const nodeUtils_1 = require("../utils/nodeUtils");
-const relationValidator = (data, staticNodeIds, computedNodeIds) => {
-    const nodeIds = new Set(Object.keys(data.nodes));
+const relationValidator = (graphData, staticNodeIds, computedNodeIds) => {
+    const nodeIds = new Set(Object.keys(graphData.nodes));
     const pendings = {};
     const waitlist = {};
     // validate input relation and set pendings and wait list
     computedNodeIds.forEach((computedNodeId) => {
-        const nodeData = data.nodes[computedNodeId];
+        const nodeData = graphData.nodes[computedNodeId];
         pendings[computedNodeId] = new Set();
         const dataSourceValidator = (sourceType, sourceNodeIds) => {
             sourceNodeIds.forEach((sourceNodeId) => {
@@ -29,6 +29,10 @@ const relationValidator = (data, staticNodeIds, computedNodeIds) => {
                 const sourceNodeIds = (0, nodeUtils_1.dataSourceNodeIds)((0, nodeUtils_1.inputs2dataSources)(nodeData.inputs));
                 dataSourceValidator("Inputs", sourceNodeIds);
             }
+            if (nodeData.params) {
+                const sourceNodeIds = (0, nodeUtils_1.dataSourceNodeIds)((0, nodeUtils_1.inputs2dataSources)(nodeData.params));
+                dataSourceValidator("Params", sourceNodeIds);
+            }
             if (nodeData.if) {
                 const sourceNodeIds = (0, nodeUtils_1.dataSourceNodeIds)((0, nodeUtils_1.inputs2dataSources)({ if: nodeData.if }));
                 dataSourceValidator("If", sourceNodeIds);
@@ -41,11 +45,15 @@ const relationValidator = (data, staticNodeIds, computedNodeIds) => {
                 const sourceNodeIds = (0, nodeUtils_1.dataSourceNodeIds)((0, nodeUtils_1.inputs2dataSources)({ graph: nodeData.graph }));
                 dataSourceValidator("Graph", sourceNodeIds);
             }
+            if (typeof nodeData.agent === "string" && nodeData.agent[0] === ":") {
+                const sourceNodeIds = (0, nodeUtils_1.dataSourceNodeIds)((0, nodeUtils_1.inputs2dataSources)({ agent: nodeData.agent }));
+                dataSourceValidator("Agent", sourceNodeIds);
+            }
         }
     });
     // TODO. validate update
     staticNodeIds.forEach((staticNodeId) => {
-        const nodeData = data.nodes[staticNodeId];
+        const nodeData = graphData.nodes[staticNodeId];
         if ("value" in nodeData && nodeData.update) {
             const update = nodeData.update;
             const updateNodeId = (0, utils_1.parseNodeName)(update).nodeId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphai",
-  "version": "0.6.8",
+  "version": "0.6.10",
   "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.4"
+    "typedoc": "^0.27.5"
   },
   "types": "./lib/index.d.ts",
   "directories": {