graphai 0.6.1 → 0.6.3

package/lib/bundle.esm.js

@@ -247,7 +247,6 @@ class ComputedNode extends Node {
         super(nodeId, graph);
         this.retryCount = 0;
         this.dataSources = []; // no longer needed. This is for transaction log.
-        this.isNamedInputs = false;
         this.isStaticNode = false;
         this.isComputedNode = true;
         this.graphId = graphId;
@@ -261,10 +260,9 @@ 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) : [];
-        if (data.inputs && !this.isNamedInputs) {
-            console.warn(`array inputs have been deprecated. nodeId: ${nodeId}: see https://github.com/receptron/graphai/blob/main/docs/NamedInputs.md`);
+        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`);
         }
         this.pendings = new Set(dataSourceNodeIds(this.dataSources));
         assert(["function", "string"].includes(typeof data.agent), "agent must be either string or function");
@@ -273,7 +271,7 @@ 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) {
             this.nestedGraph = typeof data.graph === "string" ? this.addPendingNode(data.graph) : data.graph;
@@ -422,18 +420,19 @@ 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.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.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: 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,
@@ -441,6 +440,7 @@ class ComputedNode extends Node {
                         config: this.graph.config,
                         graphLoader: this.graph.graphLoader,
                     },
+                    onLogCallback: this.graph.onLogCallback,
                 };
             }
             this.beforeConsoleLog(context);
@@ -501,17 +501,18 @@ class ComputedNode extends Node {
             return tmp;
         }, { ...this.params });
     }
-    getInputs(previousResults) {
-        if (Array.isArray(this.inputs)) {
-            return (this.inputs ?? []).map((key) => previousResults[String(key)]).filter((a) => !this.anyInput || a);
-        }
-        return [];
+    /*
+    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),
-            namedInputs: this.isNamedInputs ? previousResults : {},
+            namedInputs: previousResults,
             inputSchema: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(this.agentId)?.inputs,
             debugInfo: this.getDebugInfo(),
             cacheType: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(this.agentId)?.cacheType,
@@ -545,7 +546,7 @@ 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) {
             console.log(this.console.before);
@@ -627,6 +628,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;
 };