From 4b697fc0df30a5bf47cc20e65402fd23842a6a9d Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 30 Jan 2024 14:03:33 -0300 Subject: [PATCH] Remove vectorstore_creator import and test_vectorstore_template.py --- src/backend/langflow/graph/graph/constants.py | 3 +-- src/backend/langflow/interface/tools/constants.py | 3 +-- src/backend/langflow/interface/types.py | 4 ++-- tests/test_vectorstore_template.py | 14 -------------- 4 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 tests/test_vectorstore_template.py diff --git a/src/backend/langflow/graph/graph/constants.py b/src/backend/langflow/graph/graph/constants.py index 9514764b7..928280743 100644 --- a/src/backend/langflow/graph/graph/constants.py +++ b/src/backend/langflow/graph/graph/constants.py @@ -12,7 +12,6 @@ from langflow.interface.retrievers.base import retriever_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.vector_store.base import vectorstore_creator from langflow.interface.wrappers.base import wrapper_creator from langflow.utils.lazy_load import LazyLoadDictBase @@ -46,7 +45,7 @@ class VertexTypesDict(LazyLoadDictBase): **{t: types.LLMVertex for t in llm_creator.to_list()}, **{t: types.MemoryVertex for t in memory_creator.to_list()}, **{t: types.EmbeddingVertex for t in embedding_creator.to_list()}, - **{t: types.VectorStoreVertex for t in vectorstore_creator.to_list()}, + # **{t: types.VectorStoreVertex for t in vectorstore_creator.to_list()}, **{t: types.DocumentLoaderVertex for t in documentloader_creator.to_list()}, **{t: types.TextSplitterVertex for t in textsplitter_creator.to_list()}, **{t: types.OutputParserVertex for t in output_parser_creator.to_list()}, diff --git a/src/backend/langflow/interface/tools/constants.py b/src/backend/langflow/interface/tools/constants.py index 89ab047d7..0ac37a0a4 100644 --- a/src/backend/langflow/interface/tools/constants.py +++ b/src/backend/langflow/interface/tools/constants.py @@ -2,7 +2,6 @@ from langchain import tools from langchain.agents import Tool from langchain.agents.load_tools import _BASE_TOOLS, _EXTRA_LLM_TOOLS, _EXTRA_OPTIONAL_TOOLS, _LLM_TOOLS from langchain.tools.json.tool import JsonSpec - from langflow.interface.importing.utils import import_class from langflow.interface.tools.custom import PythonFunction, PythonFunctionTool @@ -13,7 +12,7 @@ CUSTOM_TOOLS = { "PythonFunction": PythonFunction, } -OTHER_TOOLS = {tool: import_class(f"langchain.tools.{tool}") for tool in tools.__all__} +OTHER_TOOLS = {tool: import_class(f"langchain_community.tools.{tool}") for tool in tools.__all__} ALL_TOOLS_NAMES = { **_BASE_TOOLS, diff --git a/src/backend/langflow/interface/types.py b/src/backend/langflow/interface/types.py index 7f44be3ec..39c68889f 100644 --- a/src/backend/langflow/interface/types.py +++ b/src/backend/langflow/interface/types.py @@ -1,4 +1,5 @@ from cachetools import LRUCache, cached + from langflow.interface.agents.base import agent_creator from langflow.interface.chains.base import chain_creator from langflow.interface.custom.directory_reader.utils import merge_nested_dicts_with_renaming @@ -14,7 +15,6 @@ 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.utilities.base import utility_creator -from langflow.interface.vector_store.base import vectorstore_creator from langflow.interface.wrappers.base import wrapper_creator @@ -46,7 +46,7 @@ def build_langchain_types_dict(): # sourcery skip: dict-assign-update-to-union toolkits_creator, wrapper_creator, embedding_creator, - vectorstore_creator, + # vectorstore_creator, documentloader_creator, textsplitter_creator, utility_creator, diff --git a/tests/test_vectorstore_template.py b/tests/test_vectorstore_template.py deleted file mode 100644 index 3b5c7ed42..000000000 --- a/tests/test_vectorstore_template.py +++ /dev/null @@ -1,14 +0,0 @@ -from fastapi.testclient import TestClient -from langflow.services.deps import get_settings_service - - -# check that all agents are in settings.agents -# are in json_response["agents"] -def test_vectorstores_settings(client: TestClient, logged_in_headers): - settings_service = get_settings_service() - response = client.get("api/v1/all", headers=logged_in_headers) - assert response.status_code == 200 - json_response = response.json() - vectorstores = json_response["vectorstores"] - settings_vecs = set(settings_service.settings.VECTORSTORES) - assert all(vs in vectorstores for vs in settings_vecs)