Merge branch 'main' into FEATURE/Vision

# Conflicts:
#	packages/components/nodes/agents/MRKLAgentChat/MRKLAgentChat.ts

packages/server/src/index.ts

@@ -27,7 +27,7 @@ import {
 import {
     getNodeModulesPackagePath,
     getStartingNodes,
-    buildLangchain,
+    buildFlow,
     getEndingNodes,
     constructGraphs,
     resolveVariables,
@@ -459,7 +459,7 @@ export class App {
             // chatFlowPool is initialized only when a flow is opened
             // if the user attempts to rename/update category without opening any flow, chatFlowPool will be undefined
             if (this.chatflowPool) {
-                // Update chatflowpool inSync to false, to build Langchain again because data has been changed
+                // Update chatflowpool inSync to false, to build flow from scratch again because data has been changed
                 this.chatflowPool.updateInSync(chatflow.id, false)
             }
 
@@ -1725,7 +1725,7 @@ export class App {
 
             const { startingNodeIds, depthQueue } = getStartingNodes(filteredGraph, stopNodeId)
 
-            await buildLangchain(
+            await buildFlow(
                 startingNodeIds,
                 nodes,
                 edges,
@@ -1993,7 +1993,7 @@ export class App {
 
                 logger.debug(`[server]: Start building chatflow ${chatflowid}`)
                 /*** BFS to traverse from Starting Nodes to Ending Node ***/
-                const reactFlowNodes = await buildLangchain(
+                const reactFlowNodes = await buildFlow(
                     startingNodeIds,
                     nodes,
                     edges,

packages/server/src/utils/index.ts

@@ -264,7 +264,7 @@ export const getEndingNodes = (nodeDependencies: INodeDependencies, graph: INode
  * @param {ICommonObject} overrideConfig
  * @param {CachePool} cachePool
  */
-export const buildLangchain = async (
+export const buildFlow = async (
     startingNodeIds: string[],
     reactFlowNodes: IReactFlowNode[],
     reactFlowEdges: IReactFlowEdge[],