@langchain/core 0.2.13-rc.2 → 0.2.13

package/dist/runnables/graph.cjs

@@ -99,14 +99,19 @@ class Graph {
         // Filter out edges connected to the node
         this.edges = this.edges.filter((edge) => edge.source !== node.id && edge.target !== node.id);
     }
-    addEdge(source, target, data) {
+    addEdge(source, target, data, conditional) {
         if (this.nodes[source.id] === undefined) {
             throw new Error(`Source node ${source.id} not in graph`);
         }
         if (this.nodes[target.id] === undefined) {
             throw new Error(`Target node ${target.id} not in graph`);
         }
-        const edge = { source: source.id, target: target.id, data };
+        const edge = {
+            source: source.id,
+            target: target.id,
+            data,
+            conditional,
+        };
         this.edges.push(edge);
         return edge;
     }
@@ -130,13 +135,37 @@ class Graph {
         });
         return found[0];
     }
-    extend(graph) {
-        // Add all nodes from the other graph, taking care to avoid duplicates
+    /**
+     * Add all nodes and edges from another graph.
+     * Note this doesn't check for duplicates, nor does it connect the graphs.
+     */
+    extend(graph, prefix = "") {
+        let finalPrefix = prefix;
+        const nodeIds = Object.values(graph.nodes).map((node) => node.id);
+        if (nodeIds.every(uuid_1.validate)) {
+            finalPrefix = "";
+        }
+        const prefixed = (id) => {
+            return finalPrefix ? `${finalPrefix}:${id}` : id;
+        };
         Object.entries(graph.nodes).forEach(([key, value]) => {
-            this.nodes[key] = value;
+            this.nodes[prefixed(key)] = { ...value, id: prefixed(key) };
+        });
+        const newEdges = graph.edges.map((edge) => {
+            return {
+                ...edge,
+                source: prefixed(edge.source),
+                target: prefixed(edge.target),
+            };
         });
         // Add all edges from the other graph
-        this.edges = [...this.edges, ...graph.edges];
+        this.edges = [...this.edges, ...newEdges];
+        const first = graph.firstNode();
+        const last = graph.lastNode();
+        return [
+            first ? { id: prefixed(first.id), data: first.data } : undefined,
+            last ? { id: prefixed(last.id), data: last.data } : undefined,
+        ];
     }
     trimFirstNode() {
         const firstNode = this.firstNode();

package/dist/runnables/graph.d.ts

@@ -6,10 +6,17 @@ export declare class Graph {
     toJSON(): Record<string, any>;
     addNode(data: RunnableInterface | RunnableIOSchema, id?: string): Node;
     removeNode(node: Node): void;
-    addEdge(source: Node, target: Node, data?: string): Edge;
+    addEdge(source: Node, target: Node, data?: string, conditional?: boolean): Edge;
     firstNode(): Node | undefined;
     lastNode(): Node | undefined;
-    extend(graph: Graph): void;
+    /**
+     * Add all nodes and edges from another graph.
+     * Note this doesn't check for duplicates, nor does it connect the graphs.
+     */
+    extend(graph: Graph, prefix?: string): ({
+        id: string;
+        data: RunnableIOSchema | RunnableInterface<any, any, import("./config.js").RunnableConfig>;
+    } | undefined)[];
     trimFirstNode(): void;
     trimLastNode(): void;
     drawMermaid(params?: {

package/dist/runnables/graph.js

@@ -96,14 +96,19 @@ export class Graph {
         // Filter out edges connected to the node
         this.edges = this.edges.filter((edge) => edge.source !== node.id && edge.target !== node.id);
     }
-    addEdge(source, target, data) {
+    addEdge(source, target, data, conditional) {
         if (this.nodes[source.id] === undefined) {
             throw new Error(`Source node ${source.id} not in graph`);
         }
         if (this.nodes[target.id] === undefined) {
             throw new Error(`Target node ${target.id} not in graph`);
         }
-        const edge = { source: source.id, target: target.id, data };
+        const edge = {
+            source: source.id,
+            target: target.id,
+            data,
+            conditional,
+        };
         this.edges.push(edge);
         return edge;
     }
@@ -127,13 +132,37 @@ export class Graph {
         });
         return found[0];
     }
-    extend(graph) {
-        // Add all nodes from the other graph, taking care to avoid duplicates
+    /**
+     * Add all nodes and edges from another graph.
+     * Note this doesn't check for duplicates, nor does it connect the graphs.
+     */
+    extend(graph, prefix = "") {
+        let finalPrefix = prefix;
+        const nodeIds = Object.values(graph.nodes).map((node) => node.id);
+        if (nodeIds.every(isUuid)) {
+            finalPrefix = "";
+        }
+        const prefixed = (id) => {
+            return finalPrefix ? `${finalPrefix}:${id}` : id;
+        };
         Object.entries(graph.nodes).forEach(([key, value]) => {
-            this.nodes[key] = value;
+            this.nodes[prefixed(key)] = { ...value, id: prefixed(key) };
+        });
+        const newEdges = graph.edges.map((edge) => {
+            return {
+                ...edge,
+                source: prefixed(edge.source),
+                target: prefixed(edge.target),
+            };
         });
         // Add all edges from the other graph
-        this.edges = [...this.edges, ...graph.edges];
+        this.edges = [...this.edges, ...newEdges];
+        const first = graph.firstNode();
+        const last = graph.lastNode();
+        return [
+            first ? { id: prefixed(first.id), data: first.data } : undefined,
+            last ? { id: prefixed(last.id), data: last.data } : undefined,
+        ];
     }
     trimFirstNode() {
         const firstNode = this.firstNode();

package/dist/runnables/tests/runnable_graph.test.js

@@ -4,14 +4,6 @@ import { StringOutputParser } from "../../output_parsers/string.js";
 import { FakeLLM } from "../../utils/testing/index.js";
 import { PromptTemplate } from "../../prompts/prompt.js";
 import { CommaSeparatedListOutputParser } from "../../output_parsers/list.js";
-// import { TavilySearchResults } from "@langchain/community/tools/tavily_search";
-// import { ChatOpenAI } from "@langchain/openai";
-// import { MemorySaver } from "@langchain/langgraph";
-// // Define the tools for the agent to use
-// import { HumanMessage } from "@langchain/core/messages";
-// import { ToolNode } from "@langchain/langgraph/prebuilt";
-// import { END, START, StateGraph, StateGraphArgs } from "@langchain/langgraph";
-// import * as fs from "fs";
 test("Test graph single runnable", async () => {
     const jsonOutputParser = new StringOutputParser();
     const graph = jsonOutputParser.getGraph();
@@ -106,70 +98,3 @@ graph TD;
 \tclassDef otherclass fill:#fad7de;
 `);
 });
-// test.only("langgraph", async () => {
-// // Define the state interface
-// interface AgentState {
-//   messages: HumanMessage[];
-// }
-// // Define the graph state
-// const graphState: StateGraphArgs<AgentState>["channels"] = {
-//   messages: {
-//     value: (x: HumanMessage[], y: HumanMessage[]) => x.concat(y),
-//     default: () => [],
-//   },
-// };
-// // Define the tools for the agent to use
-// const tools = [new TavilySearchResults({ maxResults: 1 })];
-// const toolNode = new ToolNode<AgentState>(tools);
-// const model = new ChatOpenAI({ temperature: 0 }).bindTools(tools);
-// // Define the function that determines whether to continue or not
-// function shouldContinue(state: AgentState): "tools" | typeof END {
-//   const messages = state.messages;
-//   const lastMessage = messages[messages.length - 1];
-//   // If the LLM makes a tool call, then we route to the "tools" node
-//   if (lastMessage.additional_kwargs.tool_calls) {
-//     return "tools";
-//   }
-//   // Otherwise, we stop (reply to the user)
-//   return END;
-// }
-// // Define the function that calls the model
-// async function callModel(state: AgentState) {
-//   const messages = state.messages;
-//   const response = await model.invoke(messages);
-//   // We return a list, because this will get added to the existing list
-//   return { messages: [response] };
-// }
-// // Define a new graph
-// const workflow = new StateGraph<AgentState>({ channels: graphState })
-//   .addNode("agent", callModel)
-//   .addNode("tools", toolNode)
-//   .addEdge(START, "agent")
-//   .addConditionalEdges("agent", shouldContinue)
-//   .addEdge("tools", "agent");
-// // Initialize memory to persist state between graph runs
-// const checkpointer = new MemorySaver();
-// // Finally, we compile it!
-// // This compiles it into a LangChain Runnable.
-// // Note that we're (optionally) passing the memory when compiling the graph
-// const app = workflow.compile({ checkpointer });
-// const graph = app.getGraph();
-// const blob = await graph.drawMermaidPng();
-// const arrayBuffer = await blob.arrayBuffer();
-// fs.writeFileSync("/Users/jacoblee/langchain/langchainjs/langchain-core/src/runnables/tests/data/graph-mermaid.png", Buffer.from(arrayBuffer));
-// // // Now it's time to use!
-// // const agentFinalState = await agent.invoke(
-// //   { messages: [new HumanMessage("what is the weather in sf")] },
-// //   { configurable: { thread_id: "42" } },
-// // );
-// // console.log(
-// //   agentFinalState.messages[agentFinalState.messages.length - 1].content,
-// // );
-// // const agentNextState = await agent.invoke(
-// //   { messages: [new HumanMessage("what about ny")] },
-// //   { configurable: { thread_id: "42" } },
-// // );
-// // console.log(
-// //   agentNextState.messages[agentNextState.messages.length - 1].content,
-// // );
-// })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/core",
-  "version": "0.2.13-rc.2",
+  "version": "0.2.13",
   "description": "Core LangChain.js abstractions and schemas",
   "type": "module",
   "engines": {