From 34f1d0aab83fb20595235c6b55e373b7557085a4 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Sat, 23 Mar 2024 00:22:33 -0300 Subject: [PATCH] Update import statements in graph files --- src/backend/langflow/graph/edge/base.py | 2 +- src/backend/langflow/graph/graph/base.py | 5 ++++- src/backend/langflow/graph/schema.py | 2 -- src/backend/langflow/graph/vertex/base.py | 6 +----- src/backend/langflow/graph/vertex/types.py | 5 +++-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/backend/langflow/graph/edge/base.py b/src/backend/langflow/graph/edge/base.py index e6583cc07..7ce3aeb69 100644 --- a/src/backend/langflow/graph/edge/base.py +++ b/src/backend/langflow/graph/edge/base.py @@ -4,7 +4,7 @@ from loguru import logger from pydantic import BaseModel, Field from langflow.graph.edge.utils import build_clean_params -from langflow.graph.schema import INPUT_FIELD_NAME +from langflow.schema.schema import INPUT_FIELD_NAME from langflow.services.deps import get_monitor_service from langflow.services.monitor.utils import log_message diff --git a/src/backend/langflow/graph/graph/base.py b/src/backend/langflow/graph/graph/base.py index 3621d539d..41cc94aed 100644 --- a/src/backend/langflow/graph/graph/base.py +++ b/src/backend/langflow/graph/graph/base.py @@ -9,11 +9,14 @@ from langflow.graph.edge.base import ContractEdge from langflow.graph.graph.constants import lazy_load_vertex_dict from langflow.graph.graph.state_manager import GraphStateManager from langflow.graph.graph.utils import process_flow -from langflow.graph.schema import INPUT_FIELD_NAME, InterfaceComponentTypes, RunOutputs +from langflow.graph.schema import InterfaceComponentTypes, RunOutputs from langflow.graph.vertex.base import Vertex from langflow.graph.vertex.types import ChatVertex, FileToolVertex, LLMVertex, RoutingVertex, StateVertex, ToolkitVertex from langflow.interface.tools.constants import FILE_TOOLS from langflow.schema import Record +from langflow.schema.schema import INPUT_FIELD_NAME +from langflow.schema import Record +from langflow.schema.schema import INPUT_FIELD_NAME if TYPE_CHECKING: from langflow.graph.schema import ResultData diff --git a/src/backend/langflow/graph/schema.py b/src/backend/langflow/graph/schema.py index dc299e220..0bbdfa720 100644 --- a/src/backend/langflow/graph/schema.py +++ b/src/backend/langflow/graph/schema.py @@ -49,8 +49,6 @@ OUTPUT_COMPONENTS = [ InterfaceComponentTypes.TextOutput, ] -INPUT_FIELD_NAME = "input_value" - class RunOutputs(BaseModel): inputs: dict = Field(default_factory=dict) diff --git a/src/backend/langflow/graph/vertex/base.py b/src/backend/langflow/graph/vertex/base.py index 1582adbe5..408deb1e9 100644 --- a/src/backend/langflow/graph/vertex/base.py +++ b/src/backend/langflow/graph/vertex/base.py @@ -4,12 +4,10 @@ import inspect import types from enum import Enum from typing import TYPE_CHECKING, Any, AsyncIterator, Callable, Dict, Iterator, List, Optional - from loguru import logger from langflow.graph.schema import ( INPUT_COMPONENTS, - INPUT_FIELD_NAME, OUTPUT_COMPONENTS, InterfaceComponentTypes, ResultData, @@ -18,9 +16,7 @@ from langflow.graph.utils import UnbuiltObject, UnbuiltResult from langflow.graph.vertex.utils import generate_result from langflow.interface.initialize import loading from langflow.interface.listing import lazy_load_dict -from langflow.services.deps import get_storage_service -from langflow.utils.constants import DIRECT_TYPES -from langflow.utils.schemas import ChatOutputResponse +from langflow.schema.schema import INPUT_FIELD_NAME from langflow.utils.util import sync_to_async, unescape_string if TYPE_CHECKING: diff --git a/src/backend/langflow/graph/vertex/types.py b/src/backend/langflow/graph/vertex/types.py index 1467919e4..c247c9738 100644 --- a/src/backend/langflow/graph/vertex/types.py +++ b/src/backend/langflow/graph/vertex/types.py @@ -1,16 +1,17 @@ import ast import json from typing import AsyncIterator, Callable, Dict, Iterator, List, Optional, Union - import yaml from langchain_core.messages import AIMessage from loguru import logger -from langflow.graph.schema import INPUT_FIELD_NAME, InterfaceComponentTypes +from langflow.graph.schema import InterfaceComponentTypes from langflow.graph.utils import UnbuiltObject, flatten_list, serialize_field from langflow.graph.vertex.base import Vertex from langflow.interface.utils import extract_input_variables_from_prompt from langflow.schema import Record +from langflow.schema.schema import INPUT_FIELD_NAME +from langflow.schema.schema import INPUT_FIELD_NAME from langflow.services.monitor.utils import log_vertex_build from langflow.utils.schemas import ChatOutputResponse from langflow.utils.util import unescape_string