graphai 0.4.8 → 0.5.1

package/README.md

@@ -190,12 +190,14 @@ nodes:
     inputs: [":source"] // == "sourceNode.query"
   database:
     agent: "nestedAgent"
-    inputs: [":question", ":projectId"]
+    inputs:
+      prompt: ":question"
+      projectId: ":projectId"
     graph:
       nodes:
         schema: // retrieves the database schema for the apecified projectId
           agent: "schemaAgent"
-          inputs: [":$1"]
+          inputs: [":projectId"]
         ... // issue query to the database and build an appropriate prompt with it.
         query: // send the generated prompt to the LLM
           agent: "llama3Agent"
@@ -296,7 +298,7 @@ nodes:
     value: [Steve Jobs, Elon Musk, Nikola Tesla]
   retriever:
     agent: "mapAgent"
-    inputs: [":people"]
+    inputs: { rows: ":people" }
     graph:
       nodes:
         query:
@@ -304,7 +306,7 @@ nodes:
           params:
             manifest:
               prompt: Describe about the person in less than 100 words
-          inputs: [":$0"]
+          inputs: [":row"]
 ```
 
 Here is the conceptual representation of this operation.

package/lib/graphai.d.ts

@@ -25,6 +25,7 @@ export declare class GraphAI {
     constructor(data: GraphData, agentFunctionInfoDictionary: AgentFunctionInfoDictionary, options?: GraphOptions);
     getAgentFunctionInfo(agentId?: string): import("./type").AgentFunctionInfo | {
         agent: () => Promise<null>;
+        inputs: null;
     };
     asString(): string;
     results<T = DefaultResultData>(all: boolean): ResultDataDictionary<T>;

package/lib/graphai.js

@@ -103,6 +103,7 @@ class GraphAI {
                 agent: async () => {
                     return null;
                 },
+                inputs: null,
             };
         }
         // We are not supposed to hit this error because the validator will catch it.

package/lib/node.d.ts

@@ -29,6 +29,7 @@ export declare class ComputedNode extends Node {
     transactionId: undefined | number;
     readonly anyInput: boolean;
     dataSources: Array<DataSource>;
+    inputNames?: Array<string>;
     pendings: Set<string>;
     private ifSource?;
     private unlessSource?;

package/lib/node.js

@@ -40,23 +40,41 @@ class ComputedNode extends Node {
         this.params = data.params ?? {};
         this.console = data.console ?? {};
         this.filterParams = data.filterParams ?? {};
+        this.retryLimit = data.retry ?? graph.retryLimit ?? 0;
+        this.timeout = data.timeout;
+        this.isResult = data.isResult ?? false;
+        this.priority = data.priority ?? 0;
+        this.anyInput = data.anyInput ?? false;
+        if (!data.inputs) {
+            this.dataSources = [];
+        }
+        else if (Array.isArray(data.inputs)) {
+            this.dataSources = (data.inputs ?? []).map((input) => (0, utils_2.parseNodeName)(input, graph.version));
+        }
+        else {
+            const inputs = data.inputs;
+            const keys = Object.keys(inputs);
+            this.inputNames = keys;
+            this.dataSources = keys.map((key) => (0, utils_2.parseNodeName)(inputs[key], graph.version));
+        }
+        this.pendings = new Set(this.dataSources.filter((source) => source.nodeId).map((source) => source.nodeId));
         if (typeof data.agent === "string") {
             this.agentId = data.agent;
         }
         else {
             (0, utils_2.assert)(typeof data.agent === "function", "agent must be either string or function");
             const agent = data.agent;
-            this.agentFunction = async ({ inputs }) => {
-                return agent(...inputs);
-            };
+            if (this.inputNames) {
+                this.agentFunction = async ({ namedInputs }) => {
+                    return agent(namedInputs);
+                };
+            }
+            else {
+                this.agentFunction = async ({ inputs }) => {
+                    return agent(...inputs);
+                };
+            }
         }
-        this.retryLimit = data.retry ?? graph.retryLimit ?? 0;
-        this.timeout = data.timeout;
-        this.isResult = data.isResult ?? false;
-        this.priority = data.priority ?? 0;
-        this.anyInput = data.anyInput ?? false;
-        this.dataSources = (data.inputs ?? []).map((input) => (0, utils_2.parseNodeName)(input, graph.version));
-        this.pendings = new Set(this.dataSources.filter((source) => source.nodeId).map((source) => source.nodeId));
         if (typeof data.graph === "string") {
             const source = (0, utils_2.parseNodeName)(data.graph, graph.version);
             (0, utils_2.assert)(!!source.nodeId, `Invalid data source ${data.graph}`);
@@ -232,16 +250,26 @@ class ComputedNode extends Node {
             const context = {
                 params: params,
                 inputs: previousResults,
+                inputSchema: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(this.agentId)?.inputs,
+                namedInputs: {},
                 debugInfo: {
                     nodeId: this.nodeId,
                     agentId: this.agentId,
                     retry: this.retryCount,
                     verbose: this.graph.verbose,
+                    version: this.graph.version,
                 },
                 filterParams: this.filterParams,
                 agentFilters: this.graph.agentFilters,
                 log: localLog,
             };
+            if (this.inputNames) {
+                context.namedInputs = this.inputNames.reduce((tmp, name, index) => {
+                    tmp[name] = previousResults[index];
+                    return tmp;
+                }, {});
+                context.inputs = [];
+            }
             // NOTE: We use the existence of graph object in the agent-specific params to determine
             // if this is a nested agent or not.
             if (this.nestedGraph) {
@@ -257,7 +285,7 @@ class ComputedNode extends Node {
                 context.agents = this.graph.agentFunctionInfoDictionary;
             }
             if (this.console.before) {
-                console.log(this.console.before === true ? JSON.stringify(context.inputs, null, 2) : this.console.before);
+                console.log(this.console.before === true ? JSON.stringify(this.inputNames ? context.namedInputs : context.inputs, null, 2) : this.console.before);
             }
             const result = await this.agentFilterHandler(context, agentFunction);
             if (this.console.after) {

package/lib/type.d.ts

@@ -30,7 +30,7 @@ export type AgentAnonymousFunction = (...params: any[]) => unknown;
 export type AgentFilterParams = Record<string, any>;
 export type ComputedNodeData = {
     agent: string | AgentAnonymousFunction;
-    inputs?: Array<any>;
+    inputs?: Array<any> | Record<string, any>;
     anyInput?: boolean;
     params?: NodeDataParams;
     filterParams?: AgentFilterParams;
@@ -61,24 +61,27 @@ export type GraphOptions = {
     taskManager?: TaskManager | undefined;
     bypassAgentIds?: string[] | undefined;
 };
-export type AgentFunctionContext<ParamsType = DefaultParamsType, InputDataType = DefaultInputData> = {
+export type AgentFunctionContext<ParamsType = DefaultParamsType, InputDataType = DefaultInputData, NamedInputDataType = DefaultInputData> = {
     params: NodeDataParams<ParamsType>;
     inputs: Array<InputDataType>;
+    inputSchema?: any;
+    namedInputs: NamedInputDataType;
     debugInfo: {
         verbose: boolean;
         nodeId: string;
         retry: number;
         agentId?: string;
+        version?: number;
     };
-    graphData?: GraphData | string;
+    graphData?: GraphData;
     agents?: AgentFunctionInfoDictionary;
     taskManager?: TaskManager;
     filterParams: AgentFilterParams;
     agentFilters?: AgentFilterInfo[];
     log?: TransactionLog[];
 };
-export type AgentFunction<ParamsType = DefaultParamsType, ResultType = DefaultResultData, InputDataType = DefaultInputData> = (context: AgentFunctionContext<ParamsType, InputDataType>) => Promise<ResultData<ResultType>>;
-export type AgentFilterFunction<ParamsType = DefaultParamsType, ResultType = DefaultResultData, InputDataType = DefaultInputData> = (context: AgentFunctionContext<ParamsType, InputDataType>, agent: AgentFunction) => Promise<ResultData<ResultType>>;
+export type AgentFunction<ParamsType = DefaultParamsType, ResultType = DefaultResultData, InputDataType = DefaultInputData, NamedInputDataType = DefaultInputData> = (context: AgentFunctionContext<ParamsType, InputDataType, NamedInputDataType>) => Promise<ResultData<ResultType>>;
+export type AgentFilterFunction<ParamsType = DefaultParamsType, ResultType = DefaultResultData, InputDataType = DefaultInputData, NamedInputDataType = DefaultInputData> = (context: AgentFunctionContext<ParamsType, InputDataType, NamedInputDataType>, agent: AgentFunction) => Promise<ResultData<ResultType>>;
 export type AgentFilterInfo = {
     name: string;
     agent: AgentFilterFunction;
@@ -88,15 +91,16 @@ export type AgentFilterInfo = {
 };
 export type AgentFunctionInfo = {
     name: string;
-    agent: AgentFunction<any, any, any>;
-    mock: AgentFunction<any, any, any>;
+    agent: AgentFunction<any, any, any, any>;
+    mock: AgentFunction<any, any, any, any>;
+    inputs?: any;
+    output?: any;
     samples: {
         inputs: any;
         params: DefaultParamsType;
         result: any;
         graph?: GraphData;
     }[];
-    skipTest?: boolean;
     description: string;
     category: string[];
     author: string;

package/lib/validators/relation_validator.js

@@ -12,17 +12,34 @@ const relationValidator = (data, staticNodeIds, computedNodeIds) => {
         const nodeData = data.nodes[computedNodeId];
         pendings[computedNodeId] = new Set();
         if ("inputs" in nodeData && nodeData && nodeData.inputs) {
-            nodeData.inputs.forEach((inputNodeId) => {
-                const sourceNodeId = (0, utils_1.parseNodeName)(inputNodeId, data.version ?? 0.02).nodeId;
-                if (sourceNodeId) {
-                    if (!nodeIds.has(sourceNodeId)) {
-                        throw new common_1.ValidationError(`Inputs not match: NodeId ${computedNodeId}, Inputs: ${sourceNodeId}`);
+            if (Array.isArray(nodeData.inputs)) {
+                nodeData.inputs.forEach((inputNodeId) => {
+                    const sourceNodeId = (0, utils_1.parseNodeName)(inputNodeId, data.version ?? 0.2).nodeId;
+                    if (sourceNodeId) {
+                        if (!nodeIds.has(sourceNodeId)) {
+                            throw new common_1.ValidationError(`Inputs not match: NodeId ${computedNodeId}, Inputs: ${sourceNodeId}`);
+                        }
+                        waitlist[sourceNodeId] === undefined && (waitlist[sourceNodeId] = new Set());
+                        pendings[computedNodeId].add(sourceNodeId);
+                        waitlist[sourceNodeId].add(computedNodeId);
                     }
-                    waitlist[sourceNodeId] === undefined && (waitlist[sourceNodeId] = new Set());
-                    pendings[computedNodeId].add(sourceNodeId);
-                    waitlist[sourceNodeId].add(computedNodeId);
-                }
-            });
+                });
+            }
+            else {
+                const keys = Object.keys(nodeData.inputs);
+                keys.forEach((key) => {
+                    const inputNodeId = nodeData.inputs[key];
+                    const sourceNodeId = (0, utils_1.parseNodeName)(inputNodeId, data.version ?? 0.3).nodeId;
+                    if (sourceNodeId) {
+                        if (!nodeIds.has(sourceNodeId)) {
+                            throw new common_1.ValidationError(`Inputs not match: NodeId ${computedNodeId}, Inputs: ${sourceNodeId}`);
+                        }
+                        waitlist[sourceNodeId] === undefined && (waitlist[sourceNodeId] = new Set());
+                        pendings[computedNodeId].add(sourceNodeId);
+                        waitlist[sourceNodeId].add(computedNodeId);
+                    }
+                });
+            }
         }
     });
     // TODO. validate update
@@ -30,7 +47,7 @@ const relationValidator = (data, staticNodeIds, computedNodeIds) => {
         const nodeData = data.nodes[staticNodeId];
         if ("value" in nodeData && nodeData.update) {
             const update = nodeData.update;
-            const updateNodeId = (0, utils_1.parseNodeName)(update, data.version ?? 0.02).nodeId;
+            const updateNodeId = (0, utils_1.parseNodeName)(update, data.version ?? 0.2).nodeId;
             if (!updateNodeId) {
                 throw new common_1.ValidationError("Update it a literal");
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphai",
-  "version": "0.4.8",
+  "version": "0.5.1",
   "description": "Asynchronous data flow execution engine for agentic AI apps.",
   "main": "lib/index.js",
   "files": [