graphai 0.6.2 → 0.6.4

package/lib/bundle.esm.js

@@ -247,7 +247,7 @@ class ComputedNode extends Node {
         super(nodeId, graph);
         this.retryCount = 0;
         this.dataSources = []; // no longer needed. This is for transaction log.
-        this.isNamedInputs = false;
+        this.isSkip = false;
         this.isStaticNode = false;
         this.isComputedNode = true;
         this.graphId = graphId;
@@ -261,8 +261,7 @@ class ComputedNode extends Node {
         this.priority = data.priority ?? 0;
         this.anyInput = data.anyInput ?? false;
         this.inputs = data.inputs;
-        // this.isNamedInputs = isObject(data.inputs) && !Array.isArray(data.inputs);
-        this.dataSources = data.inputs ? inputs2dataSources(data.inputs).flat(10) : [];
+        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`);
         }
@@ -273,7 +272,6 @@ class ComputedNode extends Node {
         }
         else {
             const agent = data.agent;
-            // this.agentFunction = this.isNamedInputs ? async ({ namedInputs, params }) => agent(namedInputs, params) : async ({ inputs }) => agent(...inputs);
             this.agentFunction = async ({ namedInputs, params }) => agent(namedInputs, params);
         }
         if (data.graph) {
@@ -288,15 +286,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() {
@@ -312,8 +305,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;
@@ -407,6 +401,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));
@@ -423,18 +421,10 @@ 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); // HACK: compiler work-around
-                }
-                context.agents = this.graph.agentFunctionInfoDictionary;
                 context.forNestedGraph = {
-                    graphData: context.graphData,
-                    agents: context.agents,
+                    graphData: "nodes" in this.nestedGraph ? this.nestedGraph : this.graph.resultOf(this.nestedGraph), // HACK: compiler work-around
+                    agents: this.graph.agentFunctionInfoDictionary,
                     graphOptions: {
                         agentFilters: this.graph.agentFilters,
                         taskManager: this.graph.taskManager,
@@ -442,6 +432,7 @@ class ComputedNode extends Node {
                         config: this.graph.config,
                         graphLoader: this.graph.graphLoader,
                     },
+                    onLogCallback: this.graph.onLogCallback,
                 };
             }
             this.beforeConsoleLog(context);
@@ -456,16 +447,20 @@ 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);
+        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) {
@@ -495,25 +490,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(),
-            // inputs: this.getInputs(previousResults),
+            params: this.graph.resultsOf(this.params),
             namedInputs: previousResults,
             inputSchema: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(this.agentId)?.inputs,
             debugInfo: this.getDebugInfo(),
@@ -548,7 +527,6 @@ class ComputedNode extends Node {
     }
     beforeConsoleLog(context) {
         if (this.console.before === true) {
-            // console.log(JSON.stringify(this.isNamedInputs ? context.namedInputs : context.inputs, null, 2));
             console.log(JSON.stringify(context.namedInputs, null, 2));
         }
         else if (this.console.before) {
@@ -593,7 +571,7 @@ const propArrayFunction = (result, propId) => {
             return result.length === 0;
         }
         // array join
-        const matchJoin = propId.match(/^join\(([,-]?)\)$/);
+        const matchJoin = propId.match(/^join\(([,-\s]?)\)$/);
         if (matchJoin && Array.isArray(matchJoin)) {
             return result.join(matchJoin[1] ?? "");
         }
@@ -631,6 +609,16 @@ const propStringFunction = (result, propId) => {
                 return ret;
             }
         }
+        if (propId === "trim()") {
+            return result.trim();
+        }
+        if (propId === "toLowerCase()") {
+            return result.toLowerCase();
+        }
+        if (propId === "toUpperCase()") {
+            return result.toUpperCase();
+        }
+        // split()
     }
     return undefined;
 };
@@ -784,6 +772,7 @@ const computedNodeAttributeKeys = [
     "priority",
     "if",
     "unless",
+    "defaultValue",
     "filterParams",
     "console",
     "passThrough",
@@ -839,9 +828,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;
 };
 
@@ -960,7 +949,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);
@@ -1047,15 +1036,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.
@@ -1224,6 +1211,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");
         }