graphai 0.2.6 → 0.2.7

package/README.md

@@ -363,9 +363,11 @@ npm run sample ./samples/home.ts
 
 Step 6. Write some code and send pull requests
 
+- Please run "yarn run format" before sending your pull request.
+- Please do not include any build files (files under /lib) to your pull reuquest.
+
 Key principles:
 
 1. Keep the core (Node and GraphAI classes) small and simple.
 2. Enhance the platform by adding 'agents' (plug ins).
 3. Simple but effective test scripts make it easy to maintain.
-4. Run "npm run format" before submitting pull requests. 

package/lib/graphai.js

@@ -15,7 +15,7 @@ class GraphAI {
             if ("value" in nodeData) {
                 _nodes[nodeId] = new node_1.StaticNode(nodeId, nodeData, this);
             }
-            else if ("agentId" in nodeData) {
+            else if ("agent" in nodeData) {
                 _nodes[nodeId] = new node_1.ComputedNode(this.graphId, nodeId, nodeData, this);
             }
             else {

package/lib/node.d.ts

@@ -19,7 +19,8 @@ export declare class ComputedNode extends Node {
     readonly nestedGraph?: GraphData;
     readonly retryLimit: number;
     retryCount: number;
-    readonly agentId: string;
+    private readonly agentId?;
+    private readonly agentFunction?;
     readonly timeout?: number;
     readonly priority: number;
     error?: Error;
@@ -30,6 +31,7 @@ export declare class ComputedNode extends Node {
     readonly isStaticNode = false;
     readonly isComputedNode = true;
     constructor(graphId: string, nodeId: string, data: ComputedNodeData, graph: GraphAI);
+    getAgentId(): string;
     isReadyNode(): boolean;
     private retry;
     private checkDataAvailability;

package/lib/node.js

@@ -39,7 +39,15 @@ class ComputedNode extends Node {
         this.graphId = graphId;
         this.params = data.params ?? {};
         this.nestedGraph = data.graph;
-        this.agentId = data.agentId;
+        if (typeof data.agent === "string") {
+            this.agentId = data.agent;
+        }
+        else {
+            (0, utils_2.assert)(typeof data.agent === "function", "agent must be either string or function");
+            this.agentFunction = async ({ inputs }) => {
+                return data.agent(...inputs);
+            };
+        }
         this.retryLimit = data.retry ?? graph.retryLimit ?? 0;
         this.timeout = data.timeout;
         this.isResult = data.isResult ?? false;
@@ -49,6 +57,9 @@ class ComputedNode extends Node {
         this.pendings = new Set(this.dataSources.filter((source) => source.nodeId).map((source) => source.nodeId));
         this.log.initForComputedNode(this);
     }
+    getAgentId() {
+        return this.agentId ?? "__custom__function"; // only for display purpose in the log.
+    }
     isReadyNode() {
         if (this.state === type_1.NodeState.Waiting && this.pendings.size === 0) {
             // Count the number of data actually available.
@@ -120,7 +131,7 @@ class ComputedNode extends Node {
     // Check if we need to apply this filter to this node or not.
     shouldApplyAgentFilter(agentFilter) {
         if (agentFilter.agentIds && Array.isArray(agentFilter.agentIds) && agentFilter.agentIds.length > 0) {
-            if (agentFilter.agentIds.includes(this.agentId)) {
+            if (this.agentId && agentFilter.agentIds.includes(this.agentId)) {
                 return true;
             }
         }
@@ -162,7 +173,7 @@ class ComputedNode extends Node {
             }, this.timeout);
         }
         try {
-            const callback = this.graph.getCallback(this.agentId);
+            const callback = this.agentFunction ?? this.graph.getCallback(this.agentId);
             const localLog = [];
             const context = {
                 params: this.params,

package/lib/transaction_log.js

@@ -8,7 +8,7 @@ class TransactionLog {
         this.state = type_1.NodeState.Waiting;
     }
     initForComputedNode(node) {
-        this.agentId = node.agentId;
+        this.agentId = node.getAgentId();
         this.params = node.params;
     }
     onInjected(node, graph, injectFrom) {

package/lib/type.d.ts

@@ -26,7 +26,7 @@ export type StaticNodeData = {
     isResult?: boolean;
 };
 export type ComputedNodeData = {
-    agentId: string;
+    agent: string | any;
     inputs?: Array<any>;
     anyInput?: boolean;
     params?: NodeDataParams;

package/lib/validator.js

@@ -17,9 +17,9 @@ const validateGraphData = (data, agentIds) => {
         const node = data.nodes[nodeId];
         const isStaticNode = "value" in node;
         (0, nodeValidator_1.nodeValidator)(node);
-        const agentId = isStaticNode ? "" : node.agentId;
+        const agentId = isStaticNode ? "" : node.agent;
         isStaticNode && (0, static_node_validator_1.staticNodeValidator)(node) && staticNodeIds.push(nodeId);
-        !isStaticNode && (0, computed_node_validator_1.computedNodeValidator)(node) && computedNodeIds.push(nodeId) && graphAgentIds.add(agentId);
+        !isStaticNode && (0, computed_node_validator_1.computedNodeValidator)(node) && computedNodeIds.push(nodeId) && typeof agentId === "string" && graphAgentIds.add(agentId);
     });
     (0, agent_validator_1.agentValidator)(graphAgentIds, new Set(agentIds));
     (0, relation_validator_1.relationValidator)(data, staticNodeIds, computedNodeIds);

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", "agentId", "graph", "isResult", "priority"];
+exports.computedNodeAttributeKeys = ["inputs", "anyInput", "params", "retry", "timeout", "agent", "graph", "isResult", "priority"];
 exports.staticNodeAttributeKeys = ["value", "update", "isResult"];

package/lib/validators/nodeValidator.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphai",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Asynchronous data flow execution engine for agentic AI apps.",
   "main": "lib/index.js",
   "files": [