graphai 0.2.8 → 0.3.0

package/README.md

@@ -22,30 +22,30 @@ nodes:
       query: describe the final sentence by the court for Sam Bank-Fried
   wikipedia: // Retrieve data from Wikipedia
     agent: wikipediaAgent
-    inputs: [source.name]
+    inputs: [:source.name]
   chunks: // Break the text from Wikipedia into chunks (2048 character each with 512 overlap）
     agent: stringSplitterAgent
-    inputs: [wikipedia]
+    inputs: [:wikipedia]
   chunkEmbeddings: // Get embedding vector of each chunk
     agent: stringEmbeddingsAgent
-    inputs: [chunks]
+    inputs: [:chunks]
   topicEmbedding: // Get embedding vector of the question
     agent: stringEmbeddingsAgent
-    inputs: [source.query]
+    inputs: [:source.query]
   similarities: // Calculate the cosine similarity of each chunk
     agent: dotProductAgent
-    inputs: [chunkEmbeddings, topicEmbedding]
+    inputs: [:chunkEmbeddings, :topicEmbedding]
   sortedChunks: // Sort chunks based on their similarities
     agent: sortByValuesAgent
-    inputs: [chunks, similarities]
+    inputs: [:chunks, :similarities]
   referenceText: // Concatenate chunks up to the token limit (5000)
     agent: tokenBoundStringsAgent
-    inputs: [sortedChunks]
+    inputs: [:sortedChunks]
     params:
       limit: 5000
   prompt: // Generate a prompt with that reference text
     agent: stringTemplateAgent
-    inputs: [source, referenceText]
+    inputs: [:source, :referenceText]
     params:
       template: |-
         Using the following document, ${0}
@@ -56,7 +56,7 @@ nodes:
       manifest:
         model: gpt-3.5-turbo
     isResult: true // indicating this is the final result
-    inputs: [prompt]
+    inputs: [:prompt]
 ```
 
 ```mermaid
@@ -96,10 +96,11 @@ A DFG consists of a collection of [nodes](#node), which contains a series of nes
 
 ### Data Source
 
-Connections between nodes will be established by references from one node to another, using either its "inputs" or "update" property. The values of those properties are *data sources*. A *data souce* is specified by either the nodeId (e.g., "node1"), or nodeId + propertyId (e.g., "node1.item"), index (e.g., "node1.$0", "node2.$last") or combinations (e.g., "node1.messages.$0.content").
+Connections between nodes will be established by references from one node to another, using either its "inputs", "update", "if" or "while" property. The values of those properties are *data sources*. A *data souce* is specified by either the ":" + nodeId (e.g., ":node1"), or ":" + nodeId + propertyId (e.g., ":node1.item"), index (e.g., ":node1.$0", ":node2.$last") or combinations (e.g., ":node1.messages.$0.content").
 
 ### DFG Structure
 
+- *version*: GraphAI version, *required*. The latest version is 0.3.
 - *nodes*: A list of node. Required.
 - *concurrency*: An optional property, which specifies the maximum number of concurrent operations (agent functions to be executed at the same time). The default is 8.
 - *loop*: An optional property, which specifies if the graph needs to be executed multiple times (iterations). See the [Loop section below](#loop) for details.
@@ -134,7 +135,7 @@ Here is an examnple (from [weather chat](https://github.com/receptron/graphai/bl
     messagesWithUserInput: {
       // Appends the user's input to the messages.
       agent: (messages: Array<any>, content: string) => [...messages, { role: "user", content }],
-      inputs: ["messages", "userInput"],
+      inputs: [":messages", ":userInput"],
       if: "checkInput",
     },
 ```
@@ -183,23 +184,23 @@ nodes:
     value: "Find out which materials we need to purchase this week for Joe Smith's residential house project."
   projectId: // identifies the projectId from the question
     agent: "identifierAgent"
-    inputs: ["source"] // == "sourceNode.query"
+    inputs: [":source"] // == "sourceNode.query"
   database:
     agent: "nestedAgent"
-    inputs: ["question", "projectId"]
+    inputs: [":question", ":projectId"]
     graph:
       nodes:
         schema: // retrieves the database schema for the apecified projectId
           agent: "schemaAgent"
-          inputs: ["$1"]
+          inputs: [":$1"]
         ... // issue query to the database and build an appropriate prompt with it.
         query: // send the generated prompt to the LLM
           agent: "llama3Agent"
-          inputs: ["prompt"]
+          inputs: [":prompt"]
           isResult: true
   response: // Deliver the answer
     agent: "deliveryAgent"      
-    inputs: [database.query.$last.content]
+    inputs: [:database.query.$last.content]
 ```
 
 The databaseQuery node (which is associated "nestedAgent") takes the data from "question" node abd "projectId" node, and make them available to inner nodes (nodes of the child graph) via phantom node, "$0" and "$1". After the completion of the child graph, the data from "query" node (which has "isResult" property) becomes available as a property of the output of "database" node.
@@ -239,14 +240,14 @@ The "update" property of two static nodes ("people" and "result"), updates those
 
 ```
 loop:
-  while: people
+  while: :people
 nodes:
   people:
     value: [Steve Jobs, Elon Musk, Nikola Tesla]
-    update: retriever.array
+    update: :retriever.array
   result:
     value: []
-    update: reducer
+    update: :reducer
     isResult: true
   retriever:
     agent: shift
@@ -256,10 +257,10 @@ nodes:
     params:
       manifest:
         prompt: Describe about the person in less than 100 words
-    inputs: [retriever.item]
+    inputs: [:retriever.item]
   reducer:
     agent: push
-    inputs: [result, query.content]
+    inputs: [:result, :query.content]
 ```
 
 ```mermaid
@@ -292,7 +293,7 @@ nodes:
     value: [Steve Jobs, Elon Musk, Nikola Tesla]
   retriever:
     agent: "mapAgent"
-    inputs: ["people"]
+    inputs: [":people"]
     graph:
       nodes:
         query:
@@ -300,7 +301,7 @@ nodes:
           params:
             manifest:
               prompt: Describe about the person in less than 100 words
-          inputs: ["$0"]
+          inputs: [":$0"]
 ```
 
 Here is the conceptual representation of this operation.
@@ -324,8 +325,8 @@ A sample code, [weather chat](https://github.com/receptron/graphai/blob/main/sam
     tool_calls: {
       // This node is activated if the LLM requests a tool call.
       agent: "nestedAgent",
-      inputs: ["groq.choices.$0.message.tool_calls", "messagesWithFirstRes"],
-      if: "groq.choices.$0.message.tool_calls",
+      inputs: [":groq.choices.$0.message.tool_calls", ":messagesWithFirstRes"],
+      if: ":groq.choices.$0.message.tool_calls",
       graph: {
         // This graph is nested only for the readability.
 ```
@@ -341,7 +342,7 @@ The [weather chat](https://github.com/receptron/graphai/blob/main/samples/sample
       // Receives messages from either case.
       agent: "copyAgent",
       anyInput: true,
-      inputs: ["no_tool_calls", "tool_calls.messagesWithSecondRes"],
+      inputs: [":no_tool_calls", ":tool_calls.messagesWithSecondRes"],
     },
 ```
 

package/lib/experimental_agents/llm_agents/groq_agent.d.ts

@@ -1,14 +1,15 @@
 import { AgentFunction } from "../../graphai";
+import { Groq } from "groq-sdk";
 export declare const groqAgent: AgentFunction<{
     model: string;
     query?: string;
     system?: string;
     verbose?: boolean;
-    tools?: Record<string, any>;
+    tools?: Record<string, Groq.Chat.CompletionCreateParams.Tool>;
     temperature?: number;
     max_tokens?: number;
-    tool_choice?: string | Record<string, any>;
-}, Record<string, any> | string, string | Array<Record<string, any>>>;
+    tool_choice?: string | Record<string, Groq.Chat.CompletionCreateParams.ToolChoice>;
+}, Groq.Chat.ChatCompletion, string | Array<Groq.Chat.CompletionCreateParams.Message>>;
 declare const groqAgentInfo: {
     name: string;
     agent: AgentFunction<{
@@ -16,21 +17,21 @@ declare const groqAgentInfo: {
         query?: string | undefined;
         system?: string | undefined;
         verbose?: boolean | undefined;
-        tools?: Record<string, any> | undefined;
+        tools?: Record<string, Groq.Chat.Completions.CompletionCreateParams.Tool> | undefined;
         temperature?: number | undefined;
         max_tokens?: number | undefined;
-        tool_choice?: string | Record<string, any> | undefined;
-    }, string | Record<string, any>, string | Record<string, any>[]>;
+        tool_choice?: string | Record<string, Groq.Chat.Completions.CompletionCreateParams.ToolChoice> | undefined;
+    }, Groq.Chat.Completions.ChatCompletion, string | Groq.Chat.Completions.CompletionCreateParams.Message[]>;
     mock: AgentFunction<{
         model: string;
         query?: string | undefined;
         system?: string | undefined;
         verbose?: boolean | undefined;
-        tools?: Record<string, any> | undefined;
+        tools?: Record<string, Groq.Chat.Completions.CompletionCreateParams.Tool> | undefined;
         temperature?: number | undefined;
         max_tokens?: number | undefined;
-        tool_choice?: string | Record<string, any> | undefined;
-    }, string | Record<string, any>, string | Record<string, any>[]>;
+        tool_choice?: string | Record<string, Groq.Chat.Completions.CompletionCreateParams.ToolChoice> | undefined;
+    }, Groq.Chat.Completions.ChatCompletion, string | Groq.Chat.Completions.CompletionCreateParams.Message[]>;
     samples: never[];
     description: string;
     category: string[];

package/lib/experimental_agents/llm_agents/groq_agent.js

@@ -28,7 +28,7 @@ const groqAgent = async ({ params, inputs }) => {
     const [input_query, previous_messages] = inputs;
     // Notice that we ignore params.system if previous_message exists.
     const messages = previous_messages && Array.isArray(previous_messages) ? previous_messages : system ? [{ role: "system", content: system }] : [];
-    const content = (query ? [query] : []).concat(input_query ? [input_query] : []).join("\n");
+    const content = (query ? [query] : []).concat(input_query && typeof input_query === "string" ? [input_query] : []).join("\n");
     if (content) {
         messages.push({
             role: "user",

package/lib/graphai.d.ts

@@ -5,7 +5,7 @@ import { ComputedNode, StaticNode } from "./node";
 import { TaskManager } from "./task_manager";
 type GraphNodes = Record<string, ComputedNode | StaticNode>;
 export declare class GraphAI {
-    private readonly version;
+    readonly version: number;
     private readonly graphId;
     private readonly data;
     private readonly loop?;

package/lib/graphai.js

@@ -40,7 +40,7 @@ class GraphAI {
         return nodes;
     }
     getValueFromResults(key, results) {
-        const source = (0, utils_1.parseNodeName)(key);
+        const source = (0, utils_1.parseNodeName)(key, this.version);
         return (0, utils_1.getDataFromSource)(source.nodeId ? results[source.nodeId] : undefined, source);
     }
     // for static
@@ -71,6 +71,9 @@ class GraphAI {
             console.log("------------ no version");
         }
         this.version = data.version ?? 0.2;
+        if (this.version < 0.3) {
+            console.log("------------ upgrade to 0.3!");
+        }
         this.retryLimit = data.retry; // optional
         this.graphId = URL.createObjectURL(new Blob()).slice(-36);
         this.data = data;

package/lib/node.js

@@ -54,21 +54,17 @@ class ComputedNode extends Node {
         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));
+        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 (data.if) {
-            this.ifSource = (0, utils_2.parseNodeName)(data.if);
+            this.ifSource = (0, utils_2.parseNodeName)(data.if, graph.version);
             (0, utils_2.assert)(!!this.ifSource.nodeId, `Invalid data source ${data.if}`);
             this.pendings.add(this.ifSource.nodeId);
         }
-        const regex = /^\$\{([^{}]+)\}$/;
         this.dynamicParams = Object.keys(this.params).reduce((tmp, key) => {
-            const value = this.params[key];
-            const match = typeof value === "string" ? value.match(regex) : null;
-            if (match) {
-                const dataSource = (0, utils_2.parseNodeName)(match[1]);
+            const dataSource = (0, utils_2.parseNodeName)(this.params[key], graph.version < 0.3 ? 0.3 : graph.version);
+            if (dataSource.nodeId) {
                 tmp[key] = dataSource;
-                (0, utils_2.assert)(!!dataSource.nodeId, `Invalid data source ${key}:${value}`);
                 this.pendings.add(dataSource.nodeId);
             }
             return tmp;

package/lib/utils/utils.d.ts

@@ -1,6 +1,6 @@
 import { DataSource, ResultData } from "../type";
 export declare const sleep: (milliseconds: number) => Promise<unknown>;
-export declare const parseNodeName: (inputNodeId: any) => DataSource;
+export declare const parseNodeName: (inputNodeId: any, version: number) => DataSource;
 export declare function assert(condition: boolean, message: string, isWarn?: boolean): asserts condition;
 export declare const isObject: (x: unknown) => boolean;
 export declare const getDataFromSource: (result: ResultData | undefined, source: DataSource) => ResultData | undefined;

package/lib/utils/utils.js

@@ -5,7 +5,7 @@ const sleep = async (milliseconds) => {
     return await new Promise((resolve) => setTimeout(resolve, milliseconds));
 };
 exports.sleep = sleep;
-const parseNodeName = (inputNodeId) => {
+const parseNodeName_02 = (inputNodeId) => {
     if (typeof inputNodeId === "string") {
         const regex = /^"(.*)"$/;
         const match = inputNodeId.match(regex);
@@ -20,6 +20,24 @@ const parseNodeName = (inputNodeId) => {
     }
     return { value: inputNodeId }; // non-string literal
 };
+const parseNodeName = (inputNodeId, version) => {
+    if (version === 0.2) {
+        return parseNodeName_02(inputNodeId);
+    }
+    if (typeof inputNodeId === "string") {
+        const regex = /^:(.*)$/;
+        const match = inputNodeId.match(regex);
+        if (!match) {
+            return { value: inputNodeId }; // string literal
+        }
+        const parts = match[1].split(".");
+        if (parts.length == 1) {
+            return { nodeId: parts[0] };
+        }
+        return { nodeId: parts[0], propIds: parts.slice(1) };
+    }
+    return { value: inputNodeId }; // non-string literal
+};
 exports.parseNodeName = parseNodeName;
 function assert(condition, message, isWarn = false) {
     if (!condition) {

package/lib/validators/relation_validator.js

@@ -12,7 +12,7 @@ const relationValidator = (data, staticNodeIds, computedNodeIds) => {
         pendings[computedNodeId] = new Set();
         if ("inputs" in nodeData && nodeData && nodeData.inputs) {
             nodeData.inputs.forEach((inputNodeId) => {
-                const sourceNodeId = (0, utils_1.parseNodeName)(inputNodeId).nodeId;
+                const sourceNodeId = (0, utils_1.parseNodeName)(inputNodeId, data.version ?? 0.02).nodeId;
                 if (sourceNodeId) {
                     if (!nodeIds.has(sourceNodeId)) {
                         throw new Error(`Inputs not match: NodeId ${computedNodeId}, Inputs: ${sourceNodeId}`);
@@ -29,7 +29,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).nodeId;
+            const updateNodeId = (0, utils_1.parseNodeName)(update, data.version ?? 0.02).nodeId;
             if (!updateNodeId) {
                 throw new Error("Update it a literal");
             }

package/package.json

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