Merge branch 'dev' into python_function_tool

tests/conftest.py

@@ -2,6 +2,7 @@ import json
 from pathlib import Path
 from typing import AsyncGenerator
 
+from langflow.graph.graph.base import Graph
 import pytest
 from fastapi.testclient import TestClient
 from httpx import AsyncClient
@@ -46,7 +47,6 @@ def client():
 
 def get_graph(_type="basic"):
     """Get a graph from a json file"""
-    from langflow.graph.graph import Graph
 
     if _type == "basic":
         path = pytest.BASIC_EXAMPLE_PATH

tests/test_graph.py

@@ -1,10 +1,12 @@
 from typing import Type, Union
+from langflow.graph.edge.base import Edge
+from langflow.graph.node.base import Node
 
 import pytest
 from langchain.chains.base import Chain
 from langchain.llms.fake import FakeListLLM
-from langflow.graph import Edge, Graph, Node
-from langflow.graph.nodes import (
+from langflow.graph import Graph
+from langflow.graph.node.types import (
     AgentNode,
     ChainNode,
     FileToolNode,