graphai 0.1.0 → 0.1.2

package/lib/graphai.js

@@ -1,78 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphAI = void 0;
+const type_1 = require("./type");
 const node_1 = require("./node");
 const utils_1 = require("./utils/utils");
+const validator_1 = require("./validator");
+const task_manager_1 = require("./task_manager");
 const defaultConcurrency = 8;
 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 nodeId2forkedNodeIds = {};
-        const forkedNodeId2Index = {};
-        const forkedNodeId2NodeId = {}; // for sources
         const nodes = Object.keys(data.nodes).reduce((_nodes, nodeId) => {
-            const fork = data.nodes[nodeId].fork;
-            const isStaticNode = (data.nodes[nodeId].agentId ?? data.agentId) === undefined;
-            const node = isStaticNode ? node_1.StaticNode : node_1.ComputedNode;
-            if (fork) {
-                // For fork, change the nodeId and increase the node
-                nodeId2forkedNodeIds[nodeId] = new Array(fork).fill(undefined).map((_, i) => {
-                    const forkedNodeId = `${nodeId}_${i}`;
-                    _nodes[forkedNodeId] = new node(forkedNodeId, i, data.nodes[nodeId], this);
-                    // Data for pending and waiting
-                    forkedNodeId2Index[forkedNodeId] = i;
-                    forkedNodeId2NodeId[forkedNodeId] = nodeId;
-                    return forkedNodeId;
-                });
+            const isStaticNode = "value" in data.nodes[nodeId];
+            if (isStaticNode) {
+                _nodes[nodeId] = new node_1.StaticNode(nodeId, data.nodes[nodeId], this);
             }
             else {
-                _nodes[nodeId] = new node(nodeId, undefined, data.nodes[nodeId], this);
+                const nodeData = data.nodes[nodeId];
+                _nodes[nodeId] = new node_1.ComputedNode(this.graphId, nodeId, nodeData, this);
             }
             return _nodes;
         }, {});
-        // Generate the waitlist for each node, and update the pendings in case of forked node.
+        // Generate the waitlist for each node.
         Object.keys(nodes).forEach((nodeId) => {
             const node = nodes[nodeId];
-            node.pendings.forEach((pending) => {
-                // If the pending(previous) node is forking
-                if (nodeId2forkedNodeIds[pending]) {
-                    //  update node.pending and pending(previous) node.wailtlist
-                    if (node.fork) {
-                        //  1:1 if current nodes are also forking.
-                        const newPendingId = nodeId2forkedNodeIds[pending][forkedNodeId2Index[nodeId]];
-                        nodes[newPendingId].waitlist.add(nodeId); // previousNode
-                        node.pendings.add(newPendingId);
-                    }
-                    else {
-                        //  1:n if current node is not forking.
-                        nodeId2forkedNodeIds[pending].forEach((newPendingId) => {
-                            nodes[newPendingId].waitlist.add(nodeId); // previousNode
-                            node.pendings.add(newPendingId);
-                        });
-                    }
-                    node.pendings.delete(pending);
-                }
-                else {
+            if (node.isComputedNode) {
+                node.pendings.forEach((pending) => {
                     if (nodes[pending]) {
                         nodes[pending].waitlist.add(nodeId); // previousNode
                     }
                     else {
                         console.error(`--- invalid input ${pending} for node, ${nodeId}`);
                     }
-                }
-            });
-            node.inputs = Array.from(node.pendings); // for fork.
-            node.sources = node.inputs.reduce((sources, input) => {
-                const refNodeId = forkedNodeId2NodeId[input] ?? input;
-                sources[input] = { nodeId: input, propId: node.sources[refNodeId].propId };
-                return sources;
-            }, {});
+                });
+            }
         });
         return nodes;
     }
     getValueFromResults(key, results) {
         const source = (0, utils_1.parseNodeName)(key);
         const result = results[source.nodeId];
-        return result ? (source.propId ? result[source.propId] : result) : undefined;
+        return result && source.propId ? result[source.propId] : result;
     }
     // for static
     initializeNodes(previousResults) {
@@ -85,32 +54,31 @@ class GraphAI {
                 const value = node?.value;
                 const update = node?.update;
                 if (value) {
-                    this.injectValue(nodeId, value);
+                    this.injectValue(nodeId, value, nodeId);
                 }
                 if (update && previousResults) {
                     const result = this.getValueFromResults(update, previousResults);
                     if (result) {
-                        this.injectValue(nodeId, result);
+                        this.injectValue(nodeId, result, update);
                     }
                 }
             }
         });
     }
-    constructor(data, callbackDictonary) {
-        this.isRunning = false;
-        this.runningNodes = new Set();
-        this.nodeQueue = []; // for Computed Node
-        this.repeatCount = 0;
+    constructor(data, callbackDictonary, taskManager = undefined) {
         this.logs = [];
+        this.onLogCallback = (__log, __isUpdate) => { };
+        this.repeatCount = 0;
+        this.graphId = URL.createObjectURL(new Blob()).slice(-36);
         this.data = data;
         this.callbackDictonary = callbackDictonary;
-        this.concurrency = data.concurrency ?? defaultConcurrency;
+        this.taskManager = taskManager ?? new task_manager_1.TaskManager(data.concurrency ?? defaultConcurrency);
         this.loop = data.loop;
-        this.agentId = data.agentId;
         this.verbose = data.verbose === true;
         this.onComplete = () => {
             console.error("-- SOMETHING IS WRONG: onComplete is called without run()");
         };
+        (0, validator_1.validateGraphData)(data, Object.keys(callbackDictonary));
         this.nodes = this.createNodes(data);
         this.initializeNodes();
     }
@@ -121,14 +89,18 @@ class GraphAI {
         throw new Error("No agent: " + agentId);
     }
     asString() {
-        return Object.keys(this.nodes)
-            .map((nodeId) => {
-            return this.nodes[nodeId].asString();
-        })
+        return Object.values(this.nodes)
+            .map((node) => node.asString())
             .join("\n");
     }
-    results() {
-        return Object.keys(this.nodes).reduce((results, nodeId) => {
+    // Public API
+    results(all) {
+        return Object.keys(this.nodes)
+            .filter((nodeId) => {
+            const node = this.nodes[nodeId];
+            return all || node.isResult;
+        })
+            .reduce((results, nodeId) => {
             const node = this.nodes[nodeId];
             if (node.result !== undefined) {
                 results[nodeId] = node.result;
@@ -136,6 +108,7 @@ class GraphAI {
             return results;
         }, {});
     }
+    // Public API
     errors() {
         return Object.keys(this.nodes).reduce((errors, nodeId) => {
             const node = this.nodes[nodeId];
@@ -152,96 +125,114 @@ class GraphAI {
         Object.keys(this.nodes).forEach((nodeId) => {
             const node = this.nodes[nodeId];
             if (node.isComputedNode) {
-                node.pushQueueIfReady();
+                this.pushQueueIfReady(node);
             }
         });
     }
-    async run() {
-        if (this.isRunning) {
+    pushQueueIfReady(node) {
+        if (node.isReadyNode()) {
+            this.pushQueue(node);
+        }
+    }
+    pushQueueIfReadyAndRunning(node) {
+        if (this.isRunning()) {
+            this.pushQueueIfReady(node);
+        }
+    }
+    // for computed
+    pushQueue(node) {
+        node.state = type_1.NodeState.Queued;
+        this.taskManager.addTask(node, this.graphId, (_node) => {
+            (0, utils_1.assert)(node.nodeId === _node.nodeId, "GraphAI.pushQueue node mismatch");
+            node.execute();
+        });
+    }
+    // Public API
+    async run(all = false) {
+        if (this.isRunning()) {
             console.error("-- Already Running");
         }
-        this.isRunning = true;
         this.pushReadyNodesIntoQueue();
         return new Promise((resolve, reject) => {
             this.onComplete = () => {
-                this.isRunning = false;
                 const errors = this.errors();
                 const nodeIds = Object.keys(errors);
                 if (nodeIds.length > 0) {
                     reject(errors[nodeIds[0]]);
                 }
                 else {
-                    resolve(this.results());
+                    resolve(this.results(all));
                 }
             };
         });
     }
-    // for computed
-    runNode(node) {
-        this.runningNodes.add(node.nodeId);
-        node.execute();
-    }
-    // for computed
-    pushQueue(node) {
-        if (this.runningNodes.size < this.concurrency) {
-            this.runNode(node);
-        }
-        else {
-            this.nodeQueue.push(node);
-        }
+    // Public only for testing
+    isRunning() {
+        return this.taskManager.isRunning(this.graphId);
     }
-    // for completed
-    removeRunning(node) {
-        this.runningNodes.delete(node.nodeId);
-        if (this.nodeQueue.length > 0) {
-            const n = this.nodeQueue.shift();
-            if (n) {
-                this.runNode(n);
-            }
+    // callback from execute
+    onExecutionComplete(node) {
+        this.taskManager.onComplete(node);
+        if (this.isRunning() || this.processLoopIfNecessary()) {
+            return; // continue running
         }
-        if (this.runningNodes.size === 0) {
-            this.repeatCount++;
-            const loop = this.loop;
-            if (loop && (loop.count === undefined || this.repeatCount < loop.count)) {
-                const results = this.results(); // results from previous loop
-                this.isRunning = false; // temporarily stop it
-                this.nodes = this.createNodes(this.data);
-                this.initializeNodes(results);
-                const checkWhileCondition = () => {
-                    if (loop.while) {
-                        const value = this.getValueFromResults(loop.while, this.results());
-                        // NOTE: We treat an empty array as false.
-                        return Array.isArray(value) ? value.length > 0 : !!value;
-                    }
-                    return true;
-                };
-                if (checkWhileCondition()) {
-                    this.isRunning = true; // restore it
-                    this.pushReadyNodesIntoQueue();
-                    return;
+        this.onComplete(); // Nothing to run. Finish it.
+    }
+    // Must be called only from onExecutionComplete righ after removeRunning
+    // Check if there is any running computed nodes.
+    // In case of no running computed note, start the another iteration if ncessary (loop)
+    processLoopIfNecessary() {
+        this.repeatCount++;
+        const loop = this.loop;
+        if (loop && (loop.count === undefined || this.repeatCount < loop.count)) {
+            const results = this.results(true); // results from previous loop
+            this.nodes = this.createNodes(this.data);
+            this.initializeNodes(results);
+            // Notice that we need to check the while condition *after* calling initializeNodes.
+            if (loop.while) {
+                const value = this.getValueFromResults(loop.while, this.results(true));
+                // NOTE: We treat an empty array as false.
+                if (Array.isArray(value) ? value.length === 0 : !value) {
+                    return false; // while condition is not met
                 }
             }
-            this.onComplete();
+            this.pushReadyNodesIntoQueue();
+            return true; // Indicating that we are going to continue.
         }
+        return false;
+    }
+    setLoopLog(log) {
+        log.isLoop = !!this.loop;
+        log.repeatCount = this.repeatCount;
     }
     appendLog(log) {
         this.logs.push(log);
+        this.onLogCallback(log, false);
     }
+    updateLog(log) {
+        this.onLogCallback(log, true);
+    }
+    // Public API
     transactionLogs() {
         return this.logs;
     }
-    injectValue(nodeId, value) {
+    // Public API
+    injectValue(nodeId, value, injectFrom) {
         const node = this.nodes[nodeId];
         if (node && node.isStaticNode) {
-            node.injectValue(value);
+            node.injectValue(value, injectFrom);
         }
         else {
-            console.error("-- Invalid nodeId", nodeId);
+            console.error("-- Inject Error: Invalid nodeId", nodeId);
+            console.error("InjectionTo can only specify static nodes");
         }
     }
-    resultsOf(sources) {
+    resultsOf(sources, anyInput = false) {
         return sources.map((source) => {
-            const result = this.nodes[source.nodeId].result;
+            const { result } = this.nodes[source.nodeId];
+            if (source.propId) {
+                (0, utils_1.assert)((0, utils_1.isObject)(result), `resultsOf: result is not object. nodeId ${source.nodeId}`, anyInput);
+            }
             return result && source.propId ? result[source.propId] : result;
         });
     }

package/lib/index.d.ts

@@ -1,2 +1,4 @@
 import { GraphAI } from "./graphai";
 export { GraphAI };
+export { AgentFunction, AgentFunctionDictonary, GraphData, ResultDataDictonary, ResultData } from "./type";
+export type { TransactionLog } from "./transaction_log";

package/lib/node.d.ts

@@ -1,44 +1,49 @@
-import type { NodeDataParams, ResultData, DataSource, NodeData } from "./type";
-import type { GraphAI } from "./graphai";
-import { NodeState } from "./type";
+import type { GraphAI, GraphData } from "./graphai";
+import { NodeDataParams, ResultData, DataSource, ComputedNodeData, StaticNodeData, NodeState } from "./type";
+import { TransactionLog } from "./transaction_log";
 export declare class Node {
-    nodeId: string;
-    sources: Record<string, DataSource>;
-    anyInput: boolean;
-    inputs: Array<string>;
-    pendings: Set<string>;
-    waitlist: Set<string>;
+    readonly nodeId: string;
+    readonly waitlist: Set<string>;
     state: NodeState;
-    fork?: number;
-    forkIndex?: number;
-    result: ResultData;
-    transactionId: undefined | number;
+    result: ResultData | undefined;
     protected graph: GraphAI;
-    constructor(nodeId: string, forkIndex: number | undefined, data: NodeData, graph: GraphAI);
+    protected log: TransactionLog;
+    constructor(nodeId: string, graph: GraphAI);
     asString(): string;
-    removePending(nodeId: string): void;
-    protected setResult(result: ResultData, state: NodeState): void;
+    protected onSetResult(): void;
 }
 export declare class ComputedNode extends Node {
-    params: NodeDataParams;
-    retryLimit: number;
+    readonly graphId: string;
+    readonly isResult: boolean;
+    readonly params: NodeDataParams;
+    readonly nestedGraph?: GraphData;
+    readonly retryLimit: number;
     retryCount: number;
-    agentId?: string;
-    timeout?: number;
+    readonly agentId?: string;
+    readonly timeout?: number;
     error?: Error;
+    transactionId: undefined | number;
+    readonly anyInput: boolean;
+    dataSources: Array<DataSource>;
+    pendings: Set<string>;
     readonly isStaticNode = false;
     readonly isComputedNode = true;
-    constructor(nodeId: string, forkIndex: number | undefined, data: NodeData, graph: GraphAI);
-    pushQueueIfReady(): void;
+    constructor(graphId: string, nodeId: string, data: ComputedNodeData, graph: GraphAI);
+    isReadyNode(): boolean;
     private retry;
     removePending(nodeId: string): void;
+    private isCurrentTransaction;
+    private executeTimeout;
     execute(): Promise<void>;
+    private prepareExecute;
+    private errorProcess;
 }
 export declare class StaticNode extends Node {
     value?: ResultData;
-    update?: string;
+    readonly update?: string;
+    readonly isResult: boolean;
     readonly isStaticNode = true;
     readonly isComputedNode = false;
-    constructor(nodeId: string, forkIndex: number | undefined, data: NodeData, graph: GraphAI);
-    injectValue(value: ResultData): void;
+    constructor(nodeId: string, data: StaticNodeData, graph: GraphAI);
+    injectValue(value: ResultData, injectFrom?: string): void;
 }