graphai 0.3.0 → 0.3.2

package/lib/node.js

@@ -38,6 +38,7 @@ class ComputedNode extends Node {
         this.isComputedNode = true;
         this.graphId = graphId;
         this.params = data.params ?? {};
+        this.filterParams = data.filterParams ?? {};
         this.nestedGraph = data.graph;
         if (typeof data.agent === "string") {
             this.agentId = data.agent;
@@ -64,12 +65,13 @@ class ComputedNode extends Node {
         this.dynamicParams = Object.keys(this.params).reduce((tmp, key) => {
             const dataSource = (0, utils_2.parseNodeName)(this.params[key], graph.version < 0.3 ? 0.3 : graph.version);
             if (dataSource.nodeId) {
+                (0, utils_2.assert)(!this.anyInput, "Dynamic params are not supported with anyInput");
                 tmp[key] = dataSource;
                 this.pendings.add(dataSource.nodeId);
             }
             return tmp;
         }, {});
-        this.log.initForComputedNode(this);
+        this.log.initForComputedNode(this, graph);
     }
     getAgentId() {
         return this.agentId ?? "__custom__function"; // only for display purpose in the log.
@@ -165,17 +167,20 @@ class ComputedNode extends Node {
         }
         return !agentFilter.agentIds && !agentFilter.nodeIds;
     }
-    agentFilterHandler(context, agent) {
+    agentFilterHandler(context, agentFunction) {
         let index = 0;
-        const next = (context) => {
+        const next = (innerContext) => {
             const agentFilter = this.graph.agentFilters[index++];
             if (agentFilter) {
                 if (this.shouldApplyAgentFilter(agentFilter)) {
-                    return agentFilter.agent(context, next);
+                    if (agentFilter.filterParams) {
+                        innerContext.filterParams = { ...agentFilter.filterParams, ...innerContext.filterParams };
+                    }
+                    return agentFilter.agent(innerContext, next);
                 }
-                return next(context);
+                return next(innerContext);
             }
-            return agent(context);
+            return agentFunction(innerContext);
         };
         return next(context);
     }
@@ -196,7 +201,7 @@ class ComputedNode extends Node {
             }, this.timeout);
         }
         try {
-            const callback = this.agentFunction ?? this.graph.getCallback(this.agentId);
+            const agentFunction = this.agentFunction ?? this.graph.getAgentFunction(this.agentId);
             const localLog = [];
             const params = Object.keys(this.dynamicParams).reduce((tmp, key) => {
                 const [result] = this.graph.resultsOf([this.dynamicParams[key]]);
@@ -208,10 +213,12 @@ class ComputedNode extends Node {
                 inputs: previousResults,
                 debugInfo: {
                     nodeId: this.nodeId,
+                    agentId: this.agentId,
                     retry: this.retryCount,
                     verbose: this.graph.verbose,
                 },
-                filterParams: {},
+                filterParams: this.filterParams,
+                agentFilters: this.graph.agentFilters,
                 log: localLog,
             };
             // NOTE: We use the existence of graph object in the agent-specific params to determine
@@ -220,9 +227,9 @@ class ComputedNode extends Node {
                 this.graph.taskManager.prepareForNesting();
                 context.taskManager = this.graph.taskManager;
                 context.graphData = this.nestedGraph;
-                context.agents = this.graph.callbackDictonary;
+                context.agents = this.graph.agentFunctionDictionary;
             }
-            const result = await this.agentFilterHandler(context, callback);
+            const result = await this.agentFilterHandler(context, agentFunction);
             if (this.nestedGraph) {
                 this.graph.taskManager.restoreAfterNesting();
             }
@@ -278,7 +285,7 @@ class StaticNode extends Node {
         this.isStaticNode = true;
         this.isComputedNode = false;
         this.value = data.value;
-        this.update = data.update;
+        this.update = data.update ? (0, utils_2.parseNodeName)(data.update, graph.version) : undefined;
         this.isResult = data.isResult ?? false;
     }
     injectValue(value, injectFrom) {

package/lib/task_manager.js

@@ -58,12 +58,9 @@ class TaskManager {
         this.concurrency--;
     }
     getStatus(verbose = false) {
-        const nodes = verbose
-            ? {
-                runningNodes: Array.from(this.runningNodes).map((node) => node.nodeId),
-                queuedNodes: this.taskQueue.map((task) => task.node.nodeId),
-            }
-            : {};
+        const runningNodes = Array.from(this.runningNodes).map((node) => node.nodeId);
+        const queuedNodes = this.taskQueue.map((task) => task.node.nodeId);
+        const nodes = verbose ? { runningNodes, queuedNodes } : {};
         return {
             concurrency: this.concurrency,
             queue: this.taskQueue.length,

package/lib/transaction_log.d.ts

@@ -19,7 +19,7 @@ export declare class TransactionLog {
     repeatCount?: number;
     log?: TransactionLog[];
     constructor(nodeId: string);
-    initForComputedNode(node: ComputedNode): void;
+    initForComputedNode(node: ComputedNode, graph: GraphAI): void;
     onInjected(node: StaticNode, graph: GraphAI, injectFrom?: string): void;
     onComplete(node: ComputedNode, graph: GraphAI, localLog: TransactionLog[]): void;
     beforeExecute(node: ComputedNode, graph: GraphAI, transactionId: number, inputs: ResultData[]): void;

package/lib/transaction_log.js

@@ -7,9 +7,10 @@ class TransactionLog {
         this.nodeId = nodeId;
         this.state = type_1.NodeState.Waiting;
     }
-    initForComputedNode(node) {
+    initForComputedNode(node, graph) {
         this.agentId = node.getAgentId();
         this.params = node.params;
+        graph.appendLog(this);
     }
     onInjected(node, graph, injectFrom) {
         const isUpdating = "endTime" in this;

package/lib/type.d.ts

@@ -27,11 +27,13 @@ export type StaticNodeData = {
     isResult?: boolean;
 };
 export type AgentNamelessFunction = (...param: any[]) => unknown;
+export type AgentFilterParams = Record<string, any>;
 export type ComputedNodeData = {
     agent: string | AgentNamelessFunction;
     inputs?: Array<any>;
     anyInput?: boolean;
     params?: NodeDataParams;
+    filterParams?: AgentFilterParams;
     retry?: number;
     timeout?: number;
     if?: string;
@@ -59,11 +61,13 @@ export type AgentFunctionContext<ParamsType = DefaultParamsType, InputDataType =
         verbose: boolean;
         nodeId: string;
         retry: number;
+        agentId?: string;
     };
     graphData?: GraphData | string;
     agents?: AgentFunctionDictonary;
     taskManager?: TaskManager;
-    filterParams: Record<string, any>;
+    filterParams: AgentFilterParams;
+    agentFilters?: AgentFilterInfo[];
     log?: TransactionLog[];
 };
 export type AgentFunction<ParamsType = DefaultParamsType, ResultType = DefaultResultData, InputDataType = DefaultInputData> = (context: AgentFunctionContext<ParamsType, InputDataType>) => Promise<ResultData<ResultType>>;
@@ -73,6 +77,7 @@ export type AgentFilterInfo = {
     agent: AgentFilterFunction;
     agentIds?: string[];
     nodeIds?: string[];
+    filterParams?: AgentFilterParams;
 };
 export type AgentFunctionDictonary = Record<string, AgentFunction<any, any, any>>;
 export type AgentFunctionInfo = {
@@ -84,6 +89,7 @@ export type AgentFunctionInfo = {
         params: DefaultParamsType;
         result: any;
     }[];
+    skipTest?: boolean;
     description: string;
     category: string[];
     author: string;

package/lib/utils/test_agents.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultTestAgents = void 0;
 const experimental_agents_1 = require("../experimental_agents");
+const openai_agent_1 = require("../experimental_agents/llm_agents/openai_agent");
 exports.defaultTestAgents = {
     bypassAgent: experimental_agents_1.bypassAgent,
     echoAgent: experimental_agents_1.echoAgent,
@@ -19,4 +20,5 @@ exports.defaultTestAgents = {
     popAgent: experimental_agents_1.popAgent,
     shiftAgent: experimental_agents_1.shiftAgent,
     streamMockAgent: experimental_agents_1.streamMockAgent,
+    openAIMockAgent: openai_agent_1.openAIMockAgent,
 };

package/lib/utils/test_utils.js

@@ -19,8 +19,8 @@ exports.defaultTestContext = {
 };
 // for agent
 const agentTestRunner = async (agentInfo) => {
-    const { agent, samples } = agentInfo;
-    if (samples.length === 0) {
+    const { agent, samples, skipTest } = agentInfo;
+    if (samples.length === 0 || skipTest) {
         console.log(`test ${agentInfo.name}: No test`);
     }
     else {

package/lib/validators/agent_validator.js

@@ -4,7 +4,7 @@ exports.agentValidator = void 0;
 const agentValidator = (graphAgentIds, agentIds) => {
     graphAgentIds.forEach((agentId) => {
         if (!agentIds.has(agentId)) {
-            throw new Error("Invalid AgentId : " + agentId + " is not in callbackDictonary.");
+            throw new Error("Invalid Agent : " + agentId + " is not in callbackDictonary.");
         }
     });
     return true;

package/lib/validators/common.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.staticNodeAttributeKeys = exports.computedNodeAttributeKeys = exports.graphDataAttributeKeys = void 0;
 exports.graphDataAttributeKeys = ["nodes", "concurrency", "agentId", "loop", "verbose", "version"];
-exports.computedNodeAttributeKeys = ["inputs", "anyInput", "params", "retry", "timeout", "agent", "graph", "isResult", "priority", "if"];
+exports.computedNodeAttributeKeys = ["inputs", "anyInput", "params", "retry", "timeout", "agent", "graph", "isResult", "priority", "if", "filterParams"];
 exports.staticNodeAttributeKeys = ["value", "update", "isResult"];

package/lib/validators/nodeValidator.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nodeValidator = void 0;
 const nodeValidator = (nodeData) => {
     if (nodeData.agent && nodeData.value) {
-        throw new Error("Cannot set both agentId and value");
+        throw new Error("Cannot set both agent and value");
     }
     if (!("agent" in nodeData) && !("value" in nodeData)) {
-        throw new Error("Either agentId or value is required");
+        throw new Error("Either agent or value is required");
     }
     return true;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphai",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Asynchronous data flow execution engine for agentic AI apps.",
   "main": "lib/index.js",
   "files": [
@@ -8,8 +8,8 @@
   ],
   "scripts": {
     "build": "rm -r lib/* && tsc && tsc-alias",
-    "eslint": "eslint --fix --ext .ts ./src ./tests ./samples",
-    "format": "prettier --write '{src,tests,samples}/**/*.ts' .eslintrc.js",
+    "eslint": "eslint",
+    "format": "prettier --write '{src,tests,samples}/**/*.ts'",
     "test": "node --test  -r tsconfig-paths/register --require ts-node/register ./tests/**/test_*.ts",
     "http_test": "node --test  -r tsconfig-paths/register --require ts-node/register ./tests/**/http_*.ts",
     "b": "yarn run format && yarn run eslint && yarn run build",
@@ -28,26 +28,27 @@
   "homepage": "https://github.com/receptron/graphai#readme",
   "devDependencies": {
     "@inquirer/prompts": "^5.0.0",
+    "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
-    "@types/node": "^20.8.7",
+    "@types/node": "^20.12.11",
     "@types/xml2js": "^0.4.14",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
     "arxiv-api-ts": "^1.0.3",
+    "cors": "^2.8.5",
     "deepmerge": "^4.3.1",
     "dotenv": "^16.4.5",
-    "eslint": "^7.32.0 || ^8.2.0",
-    "eslint-plugin-import": "^2.25.2",
+    "eslint": "^9.2.0",
     "express": "^4.19.2",
+    "globals": "^15.2.0",
     "groq-sdk": "^0.3.3",
     "openai": "^4.12.4",
-    "prettier": "^3.0.3",
-    "slashgpt": "^0.0.8",
+    "prettier": "^3.2.5",
+    "slashgpt": "^0.0.9",
     "tiktoken": "^1.0.14",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.8",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.2.2",
+    "typescript": "^5.4.5",
+    "typescript-eslint": "^7.8.0",
     "wikipedia": "^2.1.2",
     "xml2js": "^0.6.2",
     "yaml": "^2.4.1"