From 3d211fc487b5f96ede946503499dcd26e91da485 Mon Sep 17 00:00:00 2001 From: Ibis Prevedello Date: Thu, 13 Apr 2023 22:12:21 -0300 Subject: [PATCH] fix test, linting, and vector_store folder --- src/backend/langflow/graph/graph.py | 2 +- src/backend/langflow/interface/base.py | 2 +- src/backend/langflow/interface/chains/base.py | 2 +- src/backend/langflow/interface/document_loaders/base.py | 2 +- src/backend/langflow/interface/embeddings/base.py | 2 +- src/backend/langflow/interface/listing.py | 2 +- src/backend/langflow/interface/llms/base.py | 2 +- src/backend/langflow/interface/prompts/base.py | 2 +- src/backend/langflow/interface/toolkits/base.py | 2 +- src/backend/langflow/interface/types.py | 2 +- .../interface/{vectorStore => vector_store}/__init__.py | 0 .../langflow/interface/{vectorStore => vector_store}/base.py | 2 +- src/backend/langflow/interface/wrappers/base.py | 2 +- tests/test_llms_template.py | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename src/backend/langflow/interface/{vectorStore => vector_store}/__init__.py (100%) rename src/backend/langflow/interface/{vectorStore => vector_store}/base.py (100%) diff --git a/src/backend/langflow/graph/graph.py b/src/backend/langflow/graph/graph.py index 06e482032..390cb9454 100644 --- a/src/backend/langflow/graph/graph.py +++ b/src/backend/langflow/graph/graph.py @@ -27,7 +27,7 @@ from langflow.interface.text_splitters.base import textsplitter_creator from langflow.interface.toolkits.base import toolkits_creator from langflow.interface.tools.base import tool_creator from langflow.interface.tools.constants import FILE_TOOLS -from langflow.interface.vectorstore.base import vectorstore_creator +from langflow.interface.vector_store.base import vectorstore_creator from langflow.interface.wrappers.base import wrapper_creator from langflow.utils import payload diff --git a/src/backend/langflow/interface/base.py b/src/backend/langflow/interface/base.py index 106adce66..663700ffd 100644 --- a/src/backend/langflow/interface/base.py +++ b/src/backend/langflow/interface/base.py @@ -1,10 +1,10 @@ from abc import ABC, abstractmethod from typing import Any, Dict, List, Optional, Type, Union -from langflow.utils.logger import logger from pydantic import BaseModel from langflow.template.base import FrontendNode, Template, TemplateField +from langflow.utils.logger import logger # 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 8bee97655..9dc8ded3f 100644 --- a/src/backend/langflow/interface/chains/base.py +++ b/src/backend/langflow/interface/chains/base.py @@ -5,8 +5,8 @@ from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import chain_type_to_cls_dict from langflow.settings import settings from langflow.template.nodes import ChainFrontendNode -from langflow.utils.util import build_template_from_class from langflow.utils.logger import logger +from langflow.utils.util import build_template_from_class # Assuming necessary imports for Field, Template, and FrontendNode classes diff --git a/src/backend/langflow/interface/document_loaders/base.py b/src/backend/langflow/interface/document_loaders/base.py index 8e2e99102..aab017c0f 100644 --- a/src/backend/langflow/interface/document_loaders/base.py +++ b/src/backend/langflow/interface/document_loaders/base.py @@ -3,8 +3,8 @@ from typing import Dict, List, Optional from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import documentloaders_type_to_cls_dict from langflow.settings import settings -from langflow.utils.util import build_template_from_class from langflow.utils.logger import logger +from langflow.utils.util import build_template_from_class def build_file_path_template( diff --git a/src/backend/langflow/interface/embeddings/base.py b/src/backend/langflow/interface/embeddings/base.py index c64cacb88..061b1d3b5 100644 --- a/src/backend/langflow/interface/embeddings/base.py +++ b/src/backend/langflow/interface/embeddings/base.py @@ -3,8 +3,8 @@ from typing import Dict, List, Optional from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import embedding_type_to_cls_dict from langflow.settings import settings -from langflow.utils.util import build_template_from_class from langflow.utils.logger import logger +from langflow.utils.util import build_template_from_class class EmbeddingCreator(LangChainTypeCreator): diff --git a/src/backend/langflow/interface/listing.py b/src/backend/langflow/interface/listing.py index 4f85cb572..cf45fd9c5 100644 --- a/src/backend/langflow/interface/listing.py +++ b/src/backend/langflow/interface/listing.py @@ -8,7 +8,7 @@ from langflow.interface.prompts.base import prompt_creator from langflow.interface.text_splitters.base import textsplitter_creator from langflow.interface.toolkits.base import toolkits_creator from langflow.interface.tools.base import tool_creator -from langflow.interface.vectorstore.base import vectorstore_creator +from langflow.interface.vector_store.base import vectorstore_creator from langflow.interface.wrappers.base import wrapper_creator diff --git a/src/backend/langflow/interface/llms/base.py b/src/backend/langflow/interface/llms/base.py index d430409f5..04a36eb2d 100644 --- a/src/backend/langflow/interface/llms/base.py +++ b/src/backend/langflow/interface/llms/base.py @@ -4,8 +4,8 @@ from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import llm_type_to_cls_dict from langflow.settings import settings from langflow.template.nodes import LLMFrontendNode -from langflow.utils.util import build_template_from_class from langflow.utils.logger import logger +from langflow.utils.util import build_template_from_class class LLMCreator(LangChainTypeCreator): diff --git a/src/backend/langflow/interface/prompts/base.py b/src/backend/langflow/interface/prompts/base.py index 260ab436a..5f83a5412 100644 --- a/src/backend/langflow/interface/prompts/base.py +++ b/src/backend/langflow/interface/prompts/base.py @@ -7,8 +7,8 @@ from langflow.interface.base import LangChainTypeCreator from langflow.interface.importing.utils import import_class from langflow.settings import settings from langflow.template.nodes import PromptFrontendNode -from langflow.utils.util import build_template_from_class from langflow.utils.logger import logger +from langflow.utils.util import build_template_from_class class PromptCreator(LangChainTypeCreator): diff --git a/src/backend/langflow/interface/toolkits/base.py b/src/backend/langflow/interface/toolkits/base.py index 45b92963d..cbe625f0d 100644 --- a/src/backend/langflow/interface/toolkits/base.py +++ b/src/backend/langflow/interface/toolkits/base.py @@ -5,8 +5,8 @@ from langchain.agents import agent_toolkits from langflow.interface.base import LangChainTypeCreator from langflow.interface.importing.utils import import_class, import_module from langflow.settings import settings -from langflow.utils.util import build_template_from_class from langflow.utils.logger import logger +from langflow.utils.util import build_template_from_class class ToolkitCreator(LangChainTypeCreator): diff --git a/src/backend/langflow/interface/types.py b/src/backend/langflow/interface/types.py index f279a3da8..fd5d9ec3e 100644 --- a/src/backend/langflow/interface/types.py +++ b/src/backend/langflow/interface/types.py @@ -8,7 +8,7 @@ from langflow.interface.prompts.base import prompt_creator from langflow.interface.text_splitters.base import textsplitter_creator from langflow.interface.toolkits.base import toolkits_creator from langflow.interface.tools.base import tool_creator -from langflow.interface.vectorstore.base import vectorstore_creator +from langflow.interface.vector_store.base import vectorstore_creator from langflow.interface.wrappers.base import wrapper_creator diff --git a/src/backend/langflow/interface/vectorStore/__init__.py b/src/backend/langflow/interface/vector_store/__init__.py similarity index 100% rename from src/backend/langflow/interface/vectorStore/__init__.py rename to src/backend/langflow/interface/vector_store/__init__.py diff --git a/src/backend/langflow/interface/vectorStore/base.py b/src/backend/langflow/interface/vector_store/base.py similarity index 100% rename from src/backend/langflow/interface/vectorStore/base.py rename to src/backend/langflow/interface/vector_store/base.py index 6f002e16d..7fca2ba0c 100644 --- a/src/backend/langflow/interface/vectorStore/base.py +++ b/src/backend/langflow/interface/vector_store/base.py @@ -3,8 +3,8 @@ from typing import Dict, List, Optional from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import vectorstores_type_to_cls_dict from langflow.settings import settings -from langflow.utils.util import build_template_from_class from langflow.utils.logger import logger +from langflow.utils.util import build_template_from_class class VectorstoreCreator(LangChainTypeCreator): diff --git a/src/backend/langflow/interface/wrappers/base.py b/src/backend/langflow/interface/wrappers/base.py index 656cce83e..f5773d07a 100644 --- a/src/backend/langflow/interface/wrappers/base.py +++ b/src/backend/langflow/interface/wrappers/base.py @@ -3,8 +3,8 @@ from typing import Dict, List, Optional from langchain import requests from langflow.interface.base import LangChainTypeCreator -from langflow.utils.util import build_template_from_class from langflow.utils.logger import logger +from langflow.utils.util import build_template_from_class class WrapperCreator(LangChainTypeCreator): diff --git a/tests/test_llms_template.py b/tests/test_llms_template.py index de1ebfb29..2e6ee606b 100644 --- a/tests/test_llms_template.py +++ b/tests/test_llms_template.py @@ -440,7 +440,7 @@ def test_chat_open_ai(client: TestClient): assert template["_type"] == "ChatOpenAI" assert ( model["description"] - == "Wrapper around OpenAI Chat large language models.To use, you should have the ``openai`` python package installed, and theenvironment variable ``OPENAI_API_KEY`` set with your API key.Any parameters that are valid to be passed to the openai.create call can be passedin, even if not explicitly saved on this class." # noqa E501 + == "Wrapper around OpenAI Chat large language models." # noqa E501 ) assert set(model["base_classes"]) == { "BaseChatModel",