From 203b8ff6fef3edec7648da5b16dde2a963cf745f Mon Sep 17 00:00:00 2001 From: Gabriel Almeida Date: Fri, 31 Mar 2023 14:06:40 -0300 Subject: [PATCH] formatting --- src/backend/langflow/__main__.py | 2 +- src/backend/langflow/api/endpoints.py | 3 +-- src/backend/langflow/custom/customs.py | 1 - src/backend/langflow/graph/__init__.py | 2 +- src/backend/langflow/interface/base.py | 7 ++--- src/backend/langflow/interface/chains/base.py | 8 +++--- .../langflow/interface/custom/types.py | 6 ++--- .../langflow/interface/custom_lists.py | 4 +-- src/backend/langflow/interface/llms/base.py | 5 ++-- .../langflow/interface/memories/base.py | 5 ++-- .../langflow/interface/prompts/base.py | 12 +++++---- src/backend/langflow/interface/run.py | 3 ++- src/backend/langflow/interface/tools/base.py | 26 +++++++++---------- .../langflow/interface/tools/constants.py | 4 +-- src/backend/langflow/interface/tools/util.py | 2 ++ .../langflow/interface/wrappers/base.py | 12 +++++---- src/backend/langflow/template/base.py | 7 +++-- src/backend/langflow/template/nodes.py | 4 +-- src/backend/langflow/utils/util.py | 1 - tests/test_custom_types.py | 2 +- tests/test_graph.py | 5 ++-- tests/test_loading.py | 8 +++--- tests/test_validate_code.py | 7 ++--- 23 files changed, 73 insertions(+), 63 deletions(-) diff --git a/src/backend/langflow/__main__.py b/src/backend/langflow/__main__.py index 4171e4da6..fe3bac79d 100644 --- a/src/backend/langflow/__main__.py +++ b/src/backend/langflow/__main__.py @@ -2,12 +2,12 @@ import logging import multiprocessing import platform from pathlib import Path -from langflow.settings import settings import typer from fastapi.staticfiles import StaticFiles from langflow.main import create_app +from langflow.settings import settings logger = logging.getLogger(__name__) diff --git a/src/backend/langflow/api/endpoints.py b/src/backend/langflow/api/endpoints.py index e0f1ac0f1..2e52fc83d 100644 --- a/src/backend/langflow/api/endpoints.py +++ b/src/backend/langflow/api/endpoints.py @@ -1,13 +1,12 @@ from typing import Any, Dict from fastapi import APIRouter, HTTPException -from langflow.api.base import Code, ValidationResponse +from langflow.api.base import Code, ValidationResponse from langflow.interface.run import process_graph from langflow.interface.types import build_langchain_types_dict from langflow.utils.validate import validate_code - # build router router = APIRouter() diff --git a/src/backend/langflow/custom/customs.py b/src/backend/langflow/custom/customs.py index c856996a3..fa14fb2e5 100644 --- a/src/backend/langflow/custom/customs.py +++ b/src/backend/langflow/custom/customs.py @@ -1,6 +1,5 @@ from langflow.template import nodes - CUSTOM_NODES = { "prompts": {**nodes.ZeroShotPromptNode().to_dict()}, "tools": {**nodes.PythonFunctionNode().to_dict(), **nodes.ToolNode().to_dict()}, diff --git a/src/backend/langflow/graph/__init__.py b/src/backend/langflow/graph/__init__.py index 3afa92b80..097b7a695 100644 --- a/src/backend/langflow/graph/__init__.py +++ b/src/backend/langflow/graph/__init__.py @@ -1,4 +1,4 @@ +from langflow.graph.base import Edge, Node from langflow.graph.graph import Graph -from langflow.graph.base import Node, Edge __all__ = ["Graph", "Node", "Edge"] diff --git a/src/backend/langflow/interface/base.py b/src/backend/langflow/interface/base.py index 3e67830a4..66a3e3c29 100644 --- a/src/backend/langflow/interface/base.py +++ b/src/backend/langflow/interface/base.py @@ -1,8 +1,9 @@ -from typing import Any, Dict, List, Optional -from pydantic import BaseModel from abc import ABC, abstractmethod -from langflow.template.template import Template, Field, FrontendNode +from typing import Any, Dict, List, Optional +from pydantic import BaseModel + +from langflow.template.base import Field, FrontendNode, Template # Assuming necessary imports for Field, Template, and FrontendNode classes diff --git a/src/backend/langflow/interface/chains/base.py b/src/backend/langflow/interface/chains/base.py index f787ceebb..e24cba99b 100644 --- a/src/backend/langflow/interface/chains/base.py +++ b/src/backend/langflow/interface/chains/base.py @@ -1,9 +1,11 @@ from typing import Dict, List -from langflow.interface.base import LangChainTypeCreator -from langflow.utils.util import build_template_from_function -from langflow.settings import settings + from langchain.chains import loading as chains_loading +from langflow.interface.base import LangChainTypeCreator +from langflow.settings import settings +from langflow.utils.util import build_template_from_function + # Assuming necessary imports for Field, Template, and FrontendNode classes diff --git a/src/backend/langflow/interface/custom/types.py b/src/backend/langflow/interface/custom/types.py index 40029112f..4c641f388 100644 --- a/src/backend/langflow/interface/custom/types.py +++ b/src/backend/langflow/interface/custom/types.py @@ -1,8 +1,8 @@ -from langflow.utils import validate +from typing import Callable, Optional + from pydantic import BaseModel, validator - -from typing import Callable, Optional +from langflow.utils import validate class Function(BaseModel): diff --git a/src/backend/langflow/interface/custom_lists.py b/src/backend/langflow/interface/custom_lists.py index 9875a8b9d..c5794a26d 100644 --- a/src/backend/langflow/interface/custom_lists.py +++ b/src/backend/langflow/interface/custom_lists.py @@ -2,10 +2,10 @@ from typing import Any from langchain import llms, requests -from langchain.llms.openai import OpenAIChat from langchain.agents import agent_toolkits -from langflow.interface.importing.utils import import_class +from langchain.llms.openai import OpenAIChat +from langflow.interface.importing.utils import import_class llm_type_to_cls_dict = llms.type_to_cls_dict llm_type_to_cls_dict["openai-chat"] = OpenAIChat diff --git a/src/backend/langflow/interface/llms/base.py b/src/backend/langflow/interface/llms/base.py index b00fe3a84..688845301 100644 --- a/src/backend/langflow/interface/llms/base.py +++ b/src/backend/langflow/interface/llms/base.py @@ -1,8 +1,9 @@ +from typing import Dict, List + +from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import llm_type_to_cls_dict from langflow.settings import settings -from langflow.interface.base import LangChainTypeCreator from langflow.utils.util import build_template_from_class -from typing import Dict, List class LLMCreator(LangChainTypeCreator): diff --git a/src/backend/langflow/interface/memories/base.py b/src/backend/langflow/interface/memories/base.py index d1ae4f3ff..99af98a1b 100644 --- a/src/backend/langflow/interface/memories/base.py +++ b/src/backend/langflow/interface/memories/base.py @@ -1,8 +1,9 @@ +from typing import Dict, List + +from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import memory_type_to_cls_dict from langflow.settings import settings -from langflow.interface.base import LangChainTypeCreator from langflow.utils.util import build_template_from_class -from typing import Dict, List class MemoryCreator(LangChainTypeCreator): diff --git a/src/backend/langflow/interface/prompts/base.py b/src/backend/langflow/interface/prompts/base.py index cf24ed9cf..f730481a9 100644 --- a/src/backend/langflow/interface/prompts/base.py +++ b/src/backend/langflow/interface/prompts/base.py @@ -1,10 +1,12 @@ -from langchain.prompts import loading -from langflow.interface.base import LangChainTypeCreator -from langflow.utils.util import build_template_from_function -from langflow.settings import settings -from langflow.custom.customs import get_custom_nodes from typing import Dict, List +from langchain.prompts import loading + +from langflow.custom.customs import get_custom_nodes +from langflow.interface.base import LangChainTypeCreator +from langflow.settings import settings +from langflow.utils.util import build_template_from_function + class PromptCreator(LangChainTypeCreator): type_name: str = "prompts" diff --git a/src/backend/langflow/interface/run.py b/src/backend/langflow/interface/run.py index f4363562c..b6853a1c0 100644 --- a/src/backend/langflow/interface/run.py +++ b/src/backend/langflow/interface/run.py @@ -3,9 +3,9 @@ import io import re from typing import Any, Dict +from langflow.graph.graph import Graph from langflow.interface import loading from langflow.utils import payload -from langflow.graph.graph import Graph def process_graph(data_graph: Dict[str, Any]): @@ -51,6 +51,7 @@ def get_result_and_thought_using_graph(loaded_langchain, message: str): except Exception as e: result = f"Error: {str(e)}" thought = "" + raise e return result, thought diff --git a/src/backend/langflow/interface/tools/base.py b/src/backend/langflow/interface/tools/base.py index 0bb395ac9..31e638955 100644 --- a/src/backend/langflow/interface/tools/base.py +++ b/src/backend/langflow/interface/tools/base.py @@ -1,27 +1,27 @@ -from langflow.custom import customs -from langflow.interface.tools.constants import ( - ALL_TOOLS_NAMES, - CUSTOM_TOOLS, - FILE_TOOLS, -) -from langflow.template.base import Field -from langflow.template.base import Template -from langflow.utils import util -from langflow.settings import settings -from langflow.interface.base import LangChainTypeCreator from typing import Dict, List + from langchain.agents.load_tools import ( _BASE_TOOLS, _EXTRA_LLM_TOOLS, _EXTRA_OPTIONAL_TOOLS, _LLM_TOOLS, ) + +from langflow.custom import customs +from langflow.interface.base import LangChainTypeCreator +from langflow.interface.tools.constants import ( + ALL_TOOLS_NAMES, + CUSTOM_TOOLS, + FILE_TOOLS, +) from langflow.interface.tools.util import ( get_tool_by_name, - get_tools_dict, get_tool_params, + get_tools_dict, ) - +from langflow.settings import settings +from langflow.template.base import Field, Template +from langflow.utils import util TOOL_INPUTS = { "str": Field( diff --git a/src/backend/langflow/interface/tools/constants.py b/src/backend/langflow/interface/tools/constants.py index 744f9cfd8..caab662a9 100644 --- a/src/backend/langflow/interface/tools/constants.py +++ b/src/backend/langflow/interface/tools/constants.py @@ -1,8 +1,8 @@ -from langchain.agents.load_tools import get_all_tool_names from langchain.agents import Tool -from langflow.interface.custom.types import PythonFunction +from langchain.agents.load_tools import get_all_tool_names from langchain.tools.json.tool import JsonSpec +from langflow.interface.custom.types import PythonFunction FILE_TOOLS = {"JsonSpec": JsonSpec} CUSTOM_TOOLS = {"Tool": Tool, "PythonFunction": PythonFunction} diff --git a/src/backend/langflow/interface/tools/util.py b/src/backend/langflow/interface/tools/util.py index 92ea40b88..42bc64797 100644 --- a/src/backend/langflow/interface/tools/util.py +++ b/src/backend/langflow/interface/tools/util.py @@ -1,6 +1,7 @@ import ast import inspect from typing import Dict, Union + from langchain.agents.load_tools import ( _BASE_TOOLS, _EXTRA_LLM_TOOLS, @@ -8,6 +9,7 @@ from langchain.agents.load_tools import ( _LLM_TOOLS, ) from langchain.agents.tools import Tool + from langflow.interface.tools.constants import CUSTOM_TOOLS, FILE_TOOLS diff --git a/src/backend/langflow/interface/wrappers/base.py b/src/backend/langflow/interface/wrappers/base.py index 81d8482b7..544d361a4 100644 --- a/src/backend/langflow/interface/wrappers/base.py +++ b/src/backend/langflow/interface/wrappers/base.py @@ -1,10 +1,12 @@ -from langchain import requests -from langflow.interface.base import LangChainTypeCreator -from langflow.utils.util import build_template_from_class -from langflow.settings import settings -from langflow.custom.customs import get_custom_nodes from typing import Dict, List +from langchain import requests + +from langflow.custom.customs import get_custom_nodes +from langflow.interface.base import LangChainTypeCreator +from langflow.settings import settings +from langflow.utils.util import build_template_from_class + class WrapperCreator(LangChainTypeCreator): type_name: str = "wrappers" diff --git a/src/backend/langflow/template/base.py b/src/backend/langflow/template/base.py index a1e5d21a0..96805de68 100644 --- a/src/backend/langflow/template/base.py +++ b/src/backend/langflow/template/base.py @@ -1,8 +1,7 @@ -from pydantic import BaseModel - - -from typing import Any, Union from abc import ABC +from typing import Any, Union + +from pydantic import BaseModel class FieldCreator(BaseModel, ABC): diff --git a/src/backend/langflow/template/nodes.py b/src/backend/langflow/template/nodes.py index bb4582ec9..76d889b32 100644 --- a/src/backend/langflow/template/nodes.py +++ b/src/backend/langflow/template/nodes.py @@ -1,6 +1,6 @@ -from langflow.template.base import Field, Template -from langflow.template.base import FrontendNode from langchain.agents.mrkl import prompt + +from langflow.template.base import Field, FrontendNode, Template from langflow.utils.constants import DEFAULT_PYTHON_FUNCTION diff --git a/src/backend/langflow/utils/util.py b/src/backend/langflow/utils/util.py index c075f10db..961058950 100644 --- a/src/backend/langflow/utils/util.py +++ b/src/backend/langflow/utils/util.py @@ -3,7 +3,6 @@ import inspect import re from typing import Dict, Optional - from langflow.utils import constants diff --git a/tests/test_custom_types.py b/tests/test_custom_types.py index 157779ae4..f42421bd1 100644 --- a/tests/test_custom_types.py +++ b/tests/test_custom_types.py @@ -1,7 +1,7 @@ # Test this: +import pytest from langflow.interface.custom.types import PythonFunction from langflow.utils import constants -import pytest def test_python_function(): diff --git a/tests/test_graph.py b/tests/test_graph.py index 43669d457..6dbe8a7e3 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -1,8 +1,9 @@ import json -from langflow.graph import Edge, Node, Graph + import pytest -from langflow.utils.payload import build_json, get_root_node from langchain.agents import AgentExecutor +from langflow.graph import Edge, Graph, Node +from langflow.utils.payload import build_json, get_root_node # Test cases for the graph module diff --git a/tests/test_loading.py b/tests/test_loading.py index b85d45e86..444c85fd9 100644 --- a/tests/test_loading.py +++ b/tests/test_loading.py @@ -1,10 +1,10 @@ import json -from langflow.graph import Graph -import pytest -from langflow import load_flow_from_json -from langflow.utils.payload import get_root_node +import pytest from langchain.agents import AgentExecutor +from langflow import load_flow_from_json +from langflow.graph import Graph +from langflow.utils.payload import get_root_node def test_load_flow_from_json(): diff --git a/tests/test_validate_code.py b/tests/test_validate_code.py index 9cb47f6e1..cacf3669c 100644 --- a/tests/test_validate_code.py +++ b/tests/test_validate_code.py @@ -1,12 +1,13 @@ +from unittest import mock + +import pytest from langflow.utils.validate import ( create_function, + execute_function, extract_function_name, validate_code, - execute_function, ) -import pytest from requests.exceptions import MissingSchema -from unittest import mock def test_validate_code():