graphai 0.6.2 → 0.6.4

package/lib/node.d.ts

@@ -19,7 +19,6 @@ export declare class ComputedNode extends Node {
     readonly isResult: boolean;
     readonly params: NodeDataParams;
     private readonly filterParams;
-    private readonly dynamicParams;
     readonly nestedGraph?: GraphData | DataSource;
     readonly retryLimit: number;
     retryCount: number;
@@ -33,10 +32,11 @@ export declare class ComputedNode extends Node {
     readonly anyInput: boolean;
     dataSources: DataSource[];
     private inputs?;
-    isNamedInputs: boolean;
     pendings: Set<string>;
     private ifSource?;
     private unlessSource?;
+    private defaultValue?;
+    private isSkip;
     readonly isStaticNode = false;
     readonly isComputedNode = true;
     constructor(graphId: string, nodeId: string, data: ComputedNodeData, graph: GraphAI);
@@ -52,9 +52,9 @@ export declare class ComputedNode extends Node {
     private shouldApplyAgentFilter;
     private agentFilterHandler;
     execute(): Promise<void>;
+    private afterExecute;
     private prepareExecute;
     private errorProcess;
-    private getParams;
     private getContext;
     private getResult;
     private getDebugInfo;

package/lib/node.js

@@ -45,7 +45,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;
@@ -59,8 +59,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 ? (0, nodeUtils_1.inputs2dataSources)(data.inputs).flat(10) : [];
+        this.dataSources = [...(data.inputs ? (0, nodeUtils_1.inputs2dataSources)(data.inputs).flat(10) : []), ...(data.params ? (0, nodeUtils_1.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`);
         }
@@ -71,7 +70,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) {
@@ -86,15 +84,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 = (0, utils_2.parseNodeName)(this.params[key]);
-            if (dataSource.nodeId) {
-                (0, utils_2.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() {
@@ -110,8 +103,9 @@ class ComputedNode extends Node {
         if (this.state !== type_1.NodeState.Waiting || this.pendings.size !== 0) {
             return false;
         }
-        if ((this.ifSource && !(0, utils_2.isLogicallyTrue)(this.graph.resultOf(this.ifSource))) ||
-            (this.unlessSource && (0, utils_2.isLogicallyTrue)(this.graph.resultOf(this.unlessSource)))) {
+        this.isSkip = !!((this.ifSource && !(0, utils_2.isLogicallyTrue)(this.graph.resultOf(this.ifSource))) ||
+            (this.unlessSource && (0, utils_2.isLogicallyTrue)(this.graph.resultOf(this.unlessSource))));
+        if (this.isSkip && this.defaultValue === undefined) {
             this.state = type_1.NodeState.Skipped;
             this.log.onSkipped(this, this.graph);
             return false;
@@ -205,6 +199,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));
@@ -221,18 +219,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,
@@ -240,6 +230,7 @@ class ComputedNode extends Node {
                         config: this.graph.config,
                         graphLoader: this.graph.graphLoader,
                     },
+                    onLogCallback: this.graph.onLogCallback,
                 };
             }
             this.beforeConsoleLog(context);
@@ -254,16 +245,20 @@ class ComputedNode extends Node {
                 console.log(`-- transactionId mismatch with ${this.nodeId} (probably timeout)`);
                 return;
             }
-            this.state = type_1.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 = type_1.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) {
@@ -293,25 +288,9 @@ class ComputedNode extends Node {
             this.retry(type_1.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(),
@@ -346,7 +325,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) {

package/lib/type.d.ts

@@ -24,7 +24,7 @@ export type DataSource = {
     propIds?: string[];
 };
 export type StaticNodeData = {
-    value: ResultData;
+    value?: ResultData;
     update?: string;
     isResult?: boolean;
     console?: Record<string, string | boolean>;
@@ -45,6 +45,7 @@ export type ComputedNodeData = {
     timeout?: number;
     if?: string;
     unless?: string;
+    defaultValue?: ResultData;
     graph?: GraphData | string;
     graphLoader?: GraphDataLoaderOption;
     isResult?: boolean;
@@ -87,9 +88,6 @@ export type AgentFunctionContext<ParamsType = DefaultParamsType, NamedInputDataT
         version?: number;
         isResult?: boolean;
     };
-    graphData?: GraphData;
-    agents?: AgentFunctionInfoDictionary;
-    taskManager?: TaskManager;
     forNestedGraph?: {
         graphData: GraphData;
         agents: AgentFunctionInfoDictionary;
@@ -103,8 +101,8 @@ export type AgentFunctionContext<ParamsType = DefaultParamsType, NamedInputDataT
     log?: TransactionLog[];
     config?: Record<string, unknown>;
 };
-export type AgentFunction<ParamsType = DefaultParamsType, ResultType = DefaultResultData, InputDataType = DefaultInputData, NamedInputDataType = undefined> = NamedInputDataType extends undefined ? (context: AgentFunctionContext<ParamsType, InputDataType>) => Promise<ResultData<ResultType>> : (context: AgentFunctionContext<ParamsType, NamedInputDataType>) => Promise<ResultData<ResultType>>;
-export type AgentFilterFunction<ParamsType = DefaultParamsType, ResultType = DefaultResultData, InputDataType = DefaultInputData, NamedInputDataType = undefined> = NamedInputDataType extends undefined ? (context: AgentFunctionContext<ParamsType, InputDataType>, agent: AgentFunction) => Promise<ResultData<ResultType>> : (context: AgentFunctionContext<ParamsType, NamedInputDataType>, agent: AgentFunction) => Promise<ResultData<ResultType>>;
+export type AgentFunction<ParamsType = DefaultParamsType, ResultType = DefaultResultData, NamedInputDataType = DefaultInputData> = (context: AgentFunctionContext<ParamsType, NamedInputDataType>) => Promise<ResultData<ResultType>>;
+export type AgentFilterFunction<ParamsType = DefaultParamsType, ResultType = DefaultResultData, NamedInputDataType = DefaultInputData> = (context: AgentFunctionContext<ParamsType, NamedInputDataType>, agent: AgentFunction) => Promise<ResultData<ResultType>>;
 export type AgentFilterInfo = {
     name: string;
     agent: AgentFilterFunction;
@@ -120,8 +118,8 @@ export type AgentFunctionInfoSample = {
 };
 export type AgentFunctionInfo = {
     name: string;
-    agent: AgentFunction<any, any, any, any>;
-    mock: AgentFunction<any, any, any, any>;
+    agent: AgentFunction<any, any, any>;
+    mock: AgentFunction<any, any, any>;
     inputs?: any;
     output?: any;
     outputFormat?: any;

package/lib/utils/prop_function.js

@@ -18,7 +18,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] ?? "");
         }
@@ -56,6 +56,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;
 };

package/lib/utils/utils.d.ts

@@ -18,7 +18,7 @@ export declare const defaultAgentInfo: {
     repository: string;
     license: string;
 };
-export declare const agentInfoWrapper: (agent: AgentFunction<any, any, any, any>) => {
+export declare const agentInfoWrapper: (agent: AgentFunction<any, any, any>) => {
     name: string;
     samples: {
         inputs: never[];
@@ -30,8 +30,8 @@ export declare const agentInfoWrapper: (agent: AgentFunction<any, any, any, any>
     author: string;
     repository: string;
     license: string;
-    agent: ((context: import("../type").AgentFunctionContext<any, any>) => Promise<any>) | ((context: import("../type").AgentFunctionContext<any, any>) => Promise<any>);
-    mock: ((context: import("../type").AgentFunctionContext<any, any>) => Promise<any>) | ((context: import("../type").AgentFunctionContext<any, any>) => Promise<any>);
+    agent: AgentFunction<any, any, any>;
+    mock: AgentFunction<any, any, any>;
 };
 export declare const debugResultKey: (agentId: string, result: any) => string[];
 export declare const isLogicallyTrue: (value: any) => boolean;

package/lib/validator.js

@@ -15,7 +15,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);
         (0, nodeValidator_1.nodeValidator)(node);
         const agentId = isStaticNode ? "" : node.agent;
         isStaticNode && (0, static_node_validator_1.staticNodeValidator)(node) && staticNodeIds.push(nodeId);

package/lib/validators/common.js

@@ -15,6 +15,7 @@ exports.computedNodeAttributeKeys = [
     "priority",
     "if",
     "unless",
+    "defaultValue",
     "filterParams",
     "console",
     "passThrough",

package/lib/validators/nodeValidator.js

@@ -6,9 +6,9 @@ const nodeValidator = (nodeData) => {
     if (nodeData.agent && nodeData.value) {
         throw new common_1.ValidationError("Cannot set both agent and value");
     }
-    if (!("agent" in nodeData) && !("value" in nodeData)) {
-        throw new common_1.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;
 };
 exports.nodeValidator = nodeValidator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphai",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Asynchronous data flow execution engine for agentic AI apps.",
   "main": "lib/bundle.cjs.js",
   "module": "lib/bundle.esm.js",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/receptron/graphai#readme",
   "devDependencies": {
-    "typedoc": "^0.27.2"
+    "typedoc": "^0.27.3"
   },
   "types": "./lib/index.d.ts",
   "directories": {