From 9d3098f3e22a2b9f531685d9adda820aba171a83 Mon Sep 17 00:00:00 2001 From: Gabriel Almeida Date: Tue, 2 May 2023 19:49:32 -0300 Subject: [PATCH] refactor(langflow): reorder imports in multiple files This commit reorders imports in multiple files to follow PEP8 guidelines and improve code readability. No functional changes were made. --- src/backend/langflow/__init__.py | 2 +- src/backend/langflow/api/callback.py | 1 + src/backend/langflow/api/chat_manager.py | 10 ++++++---- src/backend/langflow/api/schemas.py | 1 + src/backend/langflow/cache/base.py | 2 +- src/backend/langflow/cache/manager.py | 3 ++- src/backend/langflow/interface/agents/custom.py | 2 +- src/backend/langflow/interface/loading.py | 2 +- src/backend/langflow/interface/run.py | 1 + src/backend/langflow/interface/utils.py | 9 +++++---- src/backend/langflow/main.py | 2 +- src/backend/langflow/utils/util.py | 2 +- tests/conftest.py | 3 +-- tests/test_cache_manager.py | 7 ++++--- tests/test_websocket.py | 1 + 15 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/backend/langflow/__init__.py b/src/backend/langflow/__init__.py index fb06fe1a7..35fe814d2 100644 --- a/src/backend/langflow/__init__.py +++ b/src/backend/langflow/__init__.py @@ -1,4 +1,4 @@ -from langflow.interface.loading import load_flow_from_json from langflow.cache import cache_manager +from langflow.interface.loading import load_flow_from_json __all__ = ["load_flow_from_json", "cache_manager"] diff --git a/src/backend/langflow/api/callback.py b/src/backend/langflow/api/callback.py index cad4b1416..baab596a4 100644 --- a/src/backend/langflow/api/callback.py +++ b/src/backend/langflow/api/callback.py @@ -1,4 +1,5 @@ from typing import Any + from langchain.callbacks.base import AsyncCallbackHandler from langflow.api.schemas import ChatResponse diff --git a/src/backend/langflow/api/chat_manager.py b/src/backend/langflow/api/chat_manager.py index 5c490c43c..2dab12e34 100644 --- a/src/backend/langflow/api/chat_manager.py +++ b/src/backend/langflow/api/chat_manager.py @@ -1,9 +1,12 @@ import asyncio -from typing import Dict, List -from collections import defaultdict -from fastapi import WebSocket import json +from collections import defaultdict +from typing import Dict, List + +from fastapi import WebSocket + from langflow.api.schemas import ChatMessage, ChatResponse, FileResponse +from langflow.cache import cache_manager from langflow.cache.manager import Subject from langflow.interface.run import ( get_result_and_steps, @@ -11,7 +14,6 @@ from langflow.interface.run import ( ) from langflow.interface.utils import pil_to_base64, try_setting_streaming_options from langflow.utils.logger import logger -from langflow.cache import cache_manager class ChatHistory(Subject): diff --git a/src/backend/langflow/api/schemas.py b/src/backend/langflow/api/schemas.py index e4adacf9e..dd157d85f 100644 --- a/src/backend/langflow/api/schemas.py +++ b/src/backend/langflow/api/schemas.py @@ -1,4 +1,5 @@ from typing import Any, Union + from pydantic import BaseModel, validator diff --git a/src/backend/langflow/cache/base.py b/src/backend/langflow/cache/base.py index ede0fb06e..73439e9dd 100644 --- a/src/backend/langflow/cache/base.py +++ b/src/backend/langflow/cache/base.py @@ -2,13 +2,13 @@ import base64 import contextlib import functools import hashlib - import json import os import tempfile from collections import OrderedDict from pathlib import Path from typing import Any, Dict + import dill # type: ignore CACHE: Dict[str, Any] = {} diff --git a/src/backend/langflow/cache/manager.py b/src/backend/langflow/cache/manager.py index 971519230..947f5ce21 100644 --- a/src/backend/langflow/cache/manager.py +++ b/src/backend/langflow/cache/manager.py @@ -1,7 +1,8 @@ from contextlib import contextmanager from typing import Any, Awaitable, Callable, List, Optional -from PIL import Image + import pandas as pd +from PIL import Image class Subject: diff --git a/src/backend/langflow/interface/agents/custom.py b/src/backend/langflow/interface/agents/custom.py index 67827bd9d..84bf793f9 100644 --- a/src/backend/langflow/interface/agents/custom.py +++ b/src/backend/langflow/interface/agents/custom.py @@ -26,9 +26,9 @@ from langchain.agents.agent_toolkits.vectorstore.prompt import ( ) from langchain.agents.mrkl.prompt import FORMAT_INSTRUCTIONS from langchain.agents.mrkl.prompt import FORMAT_INSTRUCTIONS as SQL_FORMAT_INSTRUCTIONS +from langchain.base_language import BaseLanguageModel from langchain.llms.base import BaseLLM from langchain.memory.chat_memory import BaseChatMemory -from langchain.base_language import BaseLanguageModel from langchain.sql_database import SQLDatabase from langchain.tools.python.tool import PythonAstREPLTool from langchain.tools.sql_database.prompt import QUERY_CHECKER diff --git a/src/backend/langflow/interface/loading.py b/src/backend/langflow/interface/loading.py index 82405319a..49cf9f698 100644 --- a/src/backend/langflow/interface/loading.py +++ b/src/backend/langflow/interface/loading.py @@ -17,6 +17,7 @@ from langchain.callbacks.base import BaseCallbackManager from langchain.chains.loading import load_chain_from_config from langchain.llms.base import BaseLLM from langchain.llms.loading import load_llm_from_config +from pydantic import ValidationError from langflow.interface.agents.custom import CUSTOM_AGENTS from langflow.interface.importing.utils import import_by_type @@ -25,7 +26,6 @@ from langflow.interface.toolkits.base import toolkits_creator from langflow.interface.types import get_type_list from langflow.interface.utils import load_file_into_dict from langflow.utils import util, validate -from pydantic import ValidationError def instantiate_class(node_type: str, base_type: str, params: Dict) -> Any: diff --git a/src/backend/langflow/interface/run.py b/src/backend/langflow/interface/run.py index 89f26944e..68639785c 100644 --- a/src/backend/langflow/interface/run.py +++ b/src/backend/langflow/interface/run.py @@ -1,6 +1,7 @@ import contextlib import io from typing import Any, Dict + from chromadb.errors import NotEnoughElementsException # type: ignore from langflow.cache.base import compute_dict_hash, load_cache, memoize_dict diff --git a/src/backend/langflow/interface/utils.py b/src/backend/langflow/interface/utils.py index 21f627b60..e8b3e417e 100644 --- a/src/backend/langflow/interface/utils.py +++ b/src/backend/langflow/interface/utils.py @@ -1,14 +1,15 @@ import base64 -from io import BytesIO import json import os -from PIL.Image import Image +from io import BytesIO + +import yaml from langchain.callbacks.manager import AsyncCallbackManager from langchain.chat_models import AzureChatOpenAI, ChatOpenAI from langchain.llms import AzureOpenAI, OpenAI -from langflow.api.callback import StreamingLLMCallbackHandler +from PIL.Image import Image -import yaml +from langflow.api.callback import StreamingLLMCallbackHandler def load_file_into_dict(file_path: str) -> dict: diff --git a/src/backend/langflow/main.py b/src/backend/langflow/main.py index c1f2decd5..56cc32e46 100644 --- a/src/backend/langflow/main.py +++ b/src/backend/langflow/main.py @@ -1,9 +1,9 @@ from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware +from langflow.api.chat import router as chat_router from langflow.api.endpoints import router as endpoints_router from langflow.api.validate import router as validate_router -from langflow.api.chat import router as chat_router def create_app(): diff --git a/src/backend/langflow/utils/util.py b/src/backend/langflow/utils/util.py index 4d2a281cb..e959b0103 100644 --- a/src/backend/langflow/utils/util.py +++ b/src/backend/langflow/utils/util.py @@ -1,7 +1,7 @@ -from functools import wraps import importlib import inspect import re +from functools import wraps from typing import Dict, Optional from docstring_parser import parse # type: ignore diff --git a/tests/conftest.py b/tests/conftest.py index 15da0d1ef..870c48a32 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,11 +1,10 @@ import json from pathlib import Path from typing import AsyncGenerator -from httpx import AsyncClient - import pytest from fastapi.testclient import TestClient +from httpx import AsyncClient def pytest_configure(): diff --git a/tests/test_cache_manager.py b/tests/test_cache_manager.py index 8680a43cb..f3e65481e 100644 --- a/tests/test_cache_manager.py +++ b/tests/test_cache_manager.py @@ -1,8 +1,9 @@ -import pytest -from PIL import Image -import pandas as pd from io import StringIO + +import pandas as pd +import pytest from langflow.cache.manager import CacheManager +from PIL import Image @pytest.fixture diff --git a/tests/test_websocket.py b/tests/test_websocket.py index 7ac646cf4..5b60d0fed 100644 --- a/tests/test_websocket.py +++ b/tests/test_websocket.py @@ -1,5 +1,6 @@ import json from unittest.mock import patch + from fastapi.testclient import TestClient