graphai 0.6.3 → 0.6.5

package/lib/bundle.esm.js

@@ -1,7 +1,14 @@
 const sleep = async (milliseconds) => {
     return await new Promise((resolve) => setTimeout(resolve, milliseconds));
 };
-const parseNodeName = (inputNodeId) => {
+const parseNodeName = (inputNodeId, isSelfNode = false) => {
+    if (isSelfNode) {
+        if (typeof inputNodeId === "string" && inputNodeId[0] === ".") {
+            const parts = inputNodeId.split(".");
+            return { nodeId: "self", propIds: parts.slice(1) };
+        }
+        return { value: inputNodeId };
+    }
     if (typeof inputNodeId === "string") {
         const regex = /^:(.*)$/;
         const match = inputNodeId.match(regex);
@@ -209,6 +216,202 @@ class TransactionLog {
     }
 }
 
+const propFunctionRegex = /^[a-zA-Z]+\([^)]*\)$/;
+const propArrayFunction = (result, propId) => {
+    if (Array.isArray(result)) {
+        if (propId === "length()") {
+            return result.length;
+        }
+        if (propId === "flat()") {
+            return result.flat();
+        }
+        if (propId === "toJSON()") {
+            return JSON.stringify(result);
+        }
+        if (propId === "isEmpty()") {
+            return result.length === 0;
+        }
+        // array join
+        const matchJoin = propId.match(/^join\(([,-\s]?)\)$/);
+        if (matchJoin && Array.isArray(matchJoin)) {
+            return result.join(matchJoin[1] ?? "");
+        }
+    }
+    return undefined;
+};
+const propObjectFunction = (result, propId) => {
+    if (isObject(result)) {
+        if (propId === "keys()") {
+            return Object.keys(result);
+        }
+        if (propId === "values()") {
+            return Object.values(result);
+        }
+        if (propId === "toJSON()") {
+            return JSON.stringify(result);
+        }
+    }
+    return undefined;
+};
+const propStringFunction = (result, propId) => {
+    if (typeof result === "string") {
+        if (propId === "codeBlock()") {
+            const match = ("\n" + result).match(/\n```[a-zA-z]*([\s\S]*?)\n```/);
+            if (match) {
+                return match[1];
+            }
+        }
+        if (propId === "jsonParse()") {
+            return JSON.parse(result);
+        }
+        if (propId === "toNumber()") {
+            const ret = Number(result);
+            if (!isNaN(ret)) {
+                return ret;
+            }
+        }
+        if (propId === "trim()") {
+            return result.trim();
+        }
+        if (propId === "toLowerCase()") {
+            return result.toLowerCase();
+        }
+        if (propId === "toUpperCase()") {
+            return result.toUpperCase();
+        }
+        // split()
+    }
+    return undefined;
+};
+const propNumberFunction = (result, propId) => {
+    if (result !== undefined && Number.isFinite(result)) {
+        if (propId === "toString()") {
+            return String(result);
+        }
+        const regex = /^add\((-?\d+)\)$/;
+        const match = propId.match(regex);
+        if (match) {
+            return Number(result) + Number(match[1]);
+        }
+    }
+    return undefined;
+};
+const propBooleanFunction = (result, propId) => {
+    if (typeof result === "boolean") {
+        if (propId === "not()") {
+            return !result;
+        }
+    }
+    return undefined;
+};
+const propFunctions = [propArrayFunction, propObjectFunction, propStringFunction, propNumberFunction, propBooleanFunction];
+
+const getNestedData = (result, propId, propFunctions) => {
+    const match = propId.match(propFunctionRegex);
+    if (match) {
+        for (const propFunction of propFunctions) {
+            const ret = propFunction(result, propId);
+            if (!isNull(ret)) {
+                return ret;
+            }
+        }
+    }
+    // for array.
+    if (Array.isArray(result)) {
+        // $0, $1. array value.
+        const regex = /^\$(\d+)$/;
+        const match = propId.match(regex);
+        if (match) {
+            const index = parseInt(match[1], 10);
+            return result[index];
+        }
+        if (propId === "$last") {
+            return result[result.length - 1];
+        }
+    }
+    else if (isObject(result)) {
+        if (propId in result) {
+            return result[propId];
+        }
+    }
+    return undefined;
+};
+const innerGetDataFromSource = (result, propIds, propFunctions) => {
+    if (!isNull(result) && propIds && propIds.length > 0) {
+        const propId = propIds[0];
+        const ret = getNestedData(result, propId, propFunctions);
+        if (ret === undefined) {
+            console.error(`prop: ${propIds.join(".")} is not hit`);
+        }
+        if (propIds.length > 1) {
+            return innerGetDataFromSource(ret, propIds.slice(1), propFunctions);
+        }
+        return ret;
+    }
+    return result;
+};
+const getDataFromSource = (result, source, propFunctions = []) => {
+    if (!source.nodeId) {
+        return source.value;
+    }
+    return innerGetDataFromSource(result, source.propIds, propFunctions);
+};
+
+const resultsOfInner = (input, nodes, propFunctions, isSelfNode = false) => {
+    if (Array.isArray(input)) {
+        return input.map((inp) => resultsOfInner(inp, nodes, propFunctions, isSelfNode));
+    }
+    if (isNamedInputs(input)) {
+        return resultsOf(input, nodes, propFunctions, isSelfNode);
+    }
+    if (typeof input === "string") {
+        const templateMatch = [...input.matchAll(/\${(:[^}]+)}/g)].map((m) => m[1]);
+        if (templateMatch.length > 0) {
+            const results = resultsOfInner(templateMatch, nodes, propFunctions, isSelfNode);
+            return Array.from(templateMatch.keys()).reduce((tmp, key) => {
+                return tmp.replaceAll("${" + templateMatch[key] + "}", results[key]);
+            }, input);
+        }
+    }
+    return resultOf(parseNodeName(input, isSelfNode), nodes, propFunctions);
+};
+const resultsOf = (inputs, nodes, propFunctions, isSelfNode = false) => {
+    return Object.keys(inputs).reduce((tmp, key) => {
+        const input = inputs[key];
+        tmp[key] = isNamedInputs(input) ? resultsOf(input, nodes, propFunctions, isSelfNode) : resultsOfInner(input, nodes, propFunctions, isSelfNode);
+        return tmp;
+    }, {});
+};
+const resultOf = (source, nodes, propFunctions) => {
+    const { result } = source.nodeId ? nodes[source.nodeId] : { result: undefined };
+    return getDataFromSource(result, source, propFunctions);
+};
+// clean up object for anyInput
+const cleanResultInner = (results) => {
+    if (Array.isArray(results)) {
+        return results.map((result) => cleanResultInner(result)).filter((result) => !isNull(result));
+    }
+    if (isObject(results)) {
+        return Object.keys(results).reduce((tmp, key) => {
+            const value = cleanResultInner(results[key]);
+            if (!isNull(value)) {
+                tmp[key] = value;
+            }
+            return tmp;
+        }, {});
+    }
+    return results;
+};
+const cleanResult = (results) => {
+    return Object.keys(results).reduce((tmp, key) => {
+        const value = cleanResultInner(results[key]);
+        if (!isNull(value)) {
+            tmp[key] = value;
+        }
+        return tmp;
+    }, {});
+};
+
 class Node {
     constructor(nodeId, graph) {
         this.waitlist = new Set(); // List of nodes which need data from this node.
@@ -234,7 +437,7 @@ class Node {
         });
     }
     afterConsoleLog(result) {
-        if (this.console.after === true) {
+        if (this.console === true || this.console.after === true) {
             console.log(typeof result === "string" ? result : JSON.stringify(result, null, 2));
         }
         else if (this.console.after) {
@@ -247,6 +450,7 @@ class ComputedNode extends Node {
         super(nodeId, graph);
         this.retryCount = 0;
         this.dataSources = []; // no longer needed. This is for transaction log.
+        this.isSkip = false;
         this.isStaticNode = false;
         this.isComputedNode = true;
         this.graphId = graphId;
@@ -260,7 +464,8 @@ class ComputedNode extends Node {
         this.priority = data.priority ?? 0;
         this.anyInput = data.anyInput ?? false;
         this.inputs = data.inputs;
-        this.dataSources = data.inputs ? inputs2dataSources(data.inputs).flat(10) : [];
+        this.output = data.output;
+        this.dataSources = [...(data.inputs ? inputs2dataSources(data.inputs).flat(10) : []), ...(data.params ? 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`);
         }
@@ -285,15 +490,10 @@ class ComputedNode extends Node {
         if (data.unless) {
             this.unlessSource = this.addPendingNode(data.unless);
         }
-        this.dynamicParams = Object.keys(this.params).reduce((tmp, key) => {
-            const dataSource = parseNodeName(this.params[key]);
-            if (dataSource.nodeId) {
-                assert(!this.anyInput, "Dynamic params are not supported with anyInput");
-                tmp[key] = dataSource;
-                this.pendings.add(dataSource.nodeId);
-            }
-            return tmp;
-        }, {});
+        if (data.defaultValue) {
+            this.defaultValue = data.defaultValue;
+        }
+        this.isSkip = false;
         this.log.initForComputedNode(this, graph);
     }
     getAgentId() {
@@ -309,8 +509,9 @@ class ComputedNode extends Node {
         if (this.state !== NodeState.Waiting || this.pendings.size !== 0) {
             return false;
         }
-        if ((this.ifSource && !isLogicallyTrue(this.graph.resultOf(this.ifSource))) ||
-            (this.unlessSource && isLogicallyTrue(this.graph.resultOf(this.unlessSource)))) {
+        this.isSkip = !!((this.ifSource && !isLogicallyTrue(this.graph.resultOf(this.ifSource))) ||
+            (this.unlessSource && isLogicallyTrue(this.graph.resultOf(this.unlessSource))));
+        if (this.isSkip && this.defaultValue === undefined) {
             this.state = NodeState.Skipped;
             this.log.onSkipped(this, this.graph);
             return false;
@@ -404,6 +605,10 @@ class ComputedNode extends Node {
     // then it removes itself from the "running node" list of the graph.
     // Notice that setting the result of this node may make other nodes ready to run.
     async execute() {
+        if (this.isSkip) {
+            this.afterExecute(this.defaultValue, []);
+            return;
+        }
         const previousResults = this.graph.resultsOf(this.inputs, this.anyInput);
         const transactionId = Date.now();
         this.prepareExecute(transactionId, Object.values(previousResults));
@@ -420,16 +625,7 @@ class ComputedNode extends Node {
             // if this is a nested agent or not.
             if (this.nestedGraph) {
                 this.graph.taskManager.prepareForNesting();
-                // context.taskManager = this.graph.taskManager;
                 context.onLogCallback = this.graph.onLogCallback;
-                /*
-                if ("nodes" in this.nestedGraph) {
-                  context.graphData = this.nestedGraph;
-                } else {
-                  context.graphData = this.graph.resultOf(this.nestedGraph) as GraphData; // HACK: compiler work-around
-                  }
-                */
-                // context.agents = this.graph.agentFunctionInfoDictionary;
                 context.forNestedGraph = {
                     graphData: "nodes" in this.nestedGraph ? this.nestedGraph : this.graph.resultOf(this.nestedGraph), // HACK: compiler work-around
                     agents: this.graph.agentFunctionInfoDictionary,
@@ -455,16 +651,23 @@ class ComputedNode extends Node {
                 console.log(`-- transactionId mismatch with ${this.nodeId} (probably timeout)`);
                 return;
             }
-            this.state = NodeState.Completed;
-            this.result = this.getResult(result);
-            this.log.onComplete(this, this.graph, localLog);
-            this.onSetResult();
-            this.graph.onExecutionComplete(this);
+            // after process
+            this.afterExecute(result, localLog);
         }
         catch (error) {
             this.errorProcess(error, transactionId, previousResults);
         }
     }
+    afterExecute(result, localLog) {
+        this.state = NodeState.Completed;
+        this.result = this.getResult(result);
+        if (this.output) {
+            this.result = resultsOf(this.output, { self: this }, this.graph.propFunctions, true);
+        }
+        this.log.onComplete(this, this.graph, localLog);
+        this.onSetResult();
+        this.graph.onExecutionComplete(this);
+    }
     // This private method (called only by execute()) prepares the ComputedNode object
     // for execution, and create a new transaction to record it.
     prepareExecute(transactionId, inputs) {
@@ -494,24 +697,9 @@ class ComputedNode extends Node {
             this.retry(NodeState.Failed, Error("Unknown"));
         }
     }
-    getParams() {
-        return Object.keys(this.dynamicParams).reduce((tmp, key) => {
-            const result = this.graph.resultOf(this.dynamicParams[key]);
-            tmp[key] = result;
-            return tmp;
-        }, { ...this.params });
-    }
-    /*
-    private getInputs(previousResults: Record<string, ResultData | undefined>) {
-      if (Array.isArray(this.inputs)) {
-        return (this.inputs ?? []).map((key) => previousResults[String(key)]).filter((a) => !this.anyInput || a);
-      }
-      return [];
-    }
-    */
     getContext(previousResults, localLog) {
         const context = {
-            params: this.getParams(),
+            params: this.graph.resultsOf(this.params),
             namedInputs: previousResults,
             inputSchema: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(this.agentId)?.inputs,
             debugInfo: this.getDebugInfo(),
@@ -545,7 +733,7 @@ class ComputedNode extends Node {
         };
     }
     beforeConsoleLog(context) {
-        if (this.console.before === true) {
+        if (this.console === true || this.console.before === true) {
             console.log(JSON.stringify(context.namedInputs, null, 2));
         }
         else if (this.console.before) {
@@ -574,212 +762,10 @@ class StaticNode extends Node {
     }
 }
 
-const propFunctionRegex = /^[a-zA-Z]+\([^)]*\)$/;
-const propArrayFunction = (result, propId) => {
-    if (Array.isArray(result)) {
-        if (propId === "length()") {
-            return result.length;
-        }
-        if (propId === "flat()") {
-            return result.flat();
-        }
-        if (propId === "toJSON()") {
-            return JSON.stringify(result);
-        }
-        if (propId === "isEmpty()") {
-            return result.length === 0;
-        }
-        // array join
-        const matchJoin = propId.match(/^join\(([,-]?)\)$/);
-        if (matchJoin && Array.isArray(matchJoin)) {
-            return result.join(matchJoin[1] ?? "");
-        }
-    }
-    return undefined;
-};
-const propObjectFunction = (result, propId) => {
-    if (isObject(result)) {
-        if (propId === "keys()") {
-            return Object.keys(result);
-        }
-        if (propId === "values()") {
-            return Object.values(result);
-        }
-        if (propId === "toJSON()") {
-            return JSON.stringify(result);
-        }
-    }
-    return undefined;
-};
-const propStringFunction = (result, propId) => {
-    if (typeof result === "string") {
-        if (propId === "codeBlock()") {
-            const match = ("\n" + result).match(/\n```[a-zA-z]*([\s\S]*?)\n```/);
-            if (match) {
-                return match[1];
-            }
-        }
-        if (propId === "jsonParse()") {
-            return JSON.parse(result);
-        }
-        if (propId === "toNumber()") {
-            const ret = Number(result);
-            if (!isNaN(ret)) {
-                return ret;
-            }
-        }
-        if (propId === "trim()") {
-            return result.trim();
-        }
-        if (propId === "toLowerCase()") {
-            return result.toLowerCase();
-        }
-        if (propId === "toUpperCase()") {
-            return result.toUpperCase();
-        }
-        // split()
-    }
-    return undefined;
-};
-const propNumberFunction = (result, propId) => {
-    if (result !== undefined && Number.isFinite(result)) {
-        if (propId === "toString()") {
-            return String(result);
-        }
-        const regex = /^add\((-?\d+)\)$/;
-        const match = propId.match(regex);
-        if (match) {
-            return Number(result) + Number(match[1]);
-        }
-    }
-    return undefined;
-};
-const propBooleanFunction = (result, propId) => {
-    if (typeof result === "boolean") {
-        if (propId === "not()") {
-            return !result;
-        }
-    }
-    return undefined;
-};
-const propFunctions = [propArrayFunction, propObjectFunction, propStringFunction, propNumberFunction, propBooleanFunction];
-
-const getNestedData = (result, propId, propFunctions) => {
-    const match = propId.match(propFunctionRegex);
-    if (match) {
-        for (const propFunction of propFunctions) {
-            const ret = propFunction(result, propId);
-            if (!isNull(ret)) {
-                return ret;
-            }
-        }
-    }
-    // for array.
-    if (Array.isArray(result)) {
-        // $0, $1. array value.
-        const regex = /^\$(\d+)$/;
-        const match = propId.match(regex);
-        if (match) {
-            const index = parseInt(match[1], 10);
-            return result[index];
-        }
-        if (propId === "$last") {
-            return result[result.length - 1];
-        }
-    }
-    else if (isObject(result)) {
-        if (propId in result) {
-            return result[propId];
-        }
-    }
-    return undefined;
-};
-const innerGetDataFromSource = (result, propIds, propFunctions) => {
-    if (!isNull(result) && propIds && propIds.length > 0) {
-        const propId = propIds[0];
-        const ret = getNestedData(result, propId, propFunctions);
-        if (ret === undefined) {
-            console.error(`prop: ${propIds.join(".")} is not hit`);
-        }
-        if (propIds.length > 1) {
-            return innerGetDataFromSource(ret, propIds.slice(1), propFunctions);
-        }
-        return ret;
-    }
-    return result;
-};
-const getDataFromSource = (result, source, propFunctions = []) => {
-    if (!source.nodeId) {
-        return source.value;
-    }
-    return innerGetDataFromSource(result, source.propIds, propFunctions);
-};
-
-const resultsOfInner = (input, nodes, propFunctions) => {
-    if (Array.isArray(input)) {
-        return input.map((inp) => resultsOfInner(inp, nodes, propFunctions));
-    }
-    if (isNamedInputs(input)) {
-        return resultsOf(input, nodes, propFunctions);
-    }
-    if (typeof input === "string") {
-        const templateMatch = [...input.matchAll(/\${(:[^}]+)}/g)].map((m) => m[1]);
-        if (templateMatch.length > 0) {
-            const results = resultsOfInner(templateMatch, nodes, propFunctions);
-            return Array.from(templateMatch.keys()).reduce((tmp, key) => {
-                return tmp.replaceAll("${" + templateMatch[key] + "}", results[key]);
-            }, input);
-        }
-    }
-    return resultOf(parseNodeName(input), nodes, propFunctions);
-};
-const resultsOf = (inputs, nodes, propFunctions) => {
-    // for inputs. TODO remove if array input is not supported
-    if (Array.isArray(inputs)) {
-        return inputs.reduce((tmp, key) => {
-            tmp[key] = resultsOfInner(key, nodes, propFunctions);
-            return tmp;
-        }, {});
-    }
-    return Object.keys(inputs).reduce((tmp, key) => {
-        const input = inputs[key];
-        tmp[key] = isNamedInputs(input) ? resultsOf(input, nodes, propFunctions) : resultsOfInner(input, nodes, propFunctions);
-        return tmp;
-    }, {});
-};
-const resultOf = (source, nodes, propFunctions) => {
-    const { result } = source.nodeId ? nodes[source.nodeId] : { result: undefined };
-    return getDataFromSource(result, source, propFunctions);
-};
-// clean up object for anyInput
-const cleanResultInner = (results) => {
-    if (Array.isArray(results)) {
-        return results.map((result) => cleanResultInner(result)).filter((result) => !isNull(result));
-    }
-    if (isObject(results)) {
-        return Object.keys(results).reduce((tmp, key) => {
-            const value = cleanResultInner(results[key]);
-            if (!isNull(value)) {
-                tmp[key] = value;
-            }
-            return tmp;
-        }, {});
-    }
-    return results;
-};
-const cleanResult = (results) => {
-    return Object.keys(results).reduce((tmp, key) => {
-        const value = cleanResultInner(results[key]);
-        if (!isNull(value)) {
-            tmp[key] = value;
-        }
-        return tmp;
-    }, {});
-};
-
 const graphDataAttributeKeys = ["nodes", "concurrency", "agentId", "loop", "verbose", "version"];
 const computedNodeAttributeKeys = [
     "inputs",
+    "output",
     "anyInput",
     "params",
     "retry",
@@ -791,6 +777,7 @@ const computedNodeAttributeKeys = [
     "priority",
     "if",
     "unless",
+    "defaultValue",
     "filterParams",
     "console",
     "passThrough",
@@ -846,9 +833,9 @@ const nodeValidator = (nodeData) => {
     if (nodeData.agent && nodeData.value) {
         throw new ValidationError("Cannot set both agent and value");
     }
-    if (!("agent" in nodeData) && !("value" in nodeData)) {
-        throw new ValidationError("Either agent or value is required");
-    }
+    // if (!("agent" in nodeData) && !("value" in nodeData)) {
+    //   throw new ValidationError("Either agent or value is required");
+    // }
     return true;
 };
 
@@ -967,7 +954,7 @@ const validateGraphData = (data, agentIds) => {
     const graphAgentIds = new Set();
     Object.keys(data.nodes).forEach((nodeId) => {
         const node = data.nodes[nodeId];
-        const isStaticNode = "value" in node;
+        const isStaticNode = !("agent" in node);
         nodeValidator(node);
         const agentId = isStaticNode ? "" : node.agent;
         isStaticNode && staticNodeValidator(node) && staticNodeIds.push(nodeId);
@@ -1054,15 +1041,13 @@ class GraphAI {
     createNodes(data) {
         const nodes = Object.keys(data.nodes).reduce((_nodes, nodeId) => {
             const nodeData = data.nodes[nodeId];
-            if ("value" in nodeData) {
-                _nodes[nodeId] = new StaticNode(nodeId, nodeData, this);
-            }
-            else if ("agent" in nodeData) {
+            if ("agent" in nodeData) {
                 _nodes[nodeId] = new ComputedNode(this.graphId, nodeId, nodeData, this);
             }
             else {
-                throw new Error("Unknown node type (neither value nor agent): " + nodeId);
+                _nodes[nodeId] = new StaticNode(nodeId, nodeData, this);
             }
+            // throw new Error("Unknown node type (neither value nor agent): " + nodeId);
             return _nodes;
         }, {});
         // Generate the waitlist for each node.
@@ -1231,6 +1216,11 @@ class GraphAI {
     }
     // Public API
     async run(all = false) {
+        if (Object.values(this.nodes)
+            .filter((node) => node.isStaticNode)
+            .some((node) => node.result === undefined && node.update === undefined)) {
+            throw new Error("Static node must have value. Set value or injectValue or set update");
+        }
         if (this.isRunning()) {
             throw new Error("This GraphUI instance is already running");
         }