From cff80d65b390252583d0051abe19e0b05c254b23 Mon Sep 17 00:00:00 2001 From: ogabrielluiz Date: Tue, 18 Jun 2024 10:34:19 -0300 Subject: [PATCH] Refactor vector search components to use updated vector store model --- .../vectorstores/base => base/vectorstores}/model.py | 0 .../base/langflow/components/vectorsearch/AstraDBSearch.py | 2 +- .../base/langflow/components/vectorsearch/CassandraSearch.py | 2 +- .../base/langflow/components/vectorsearch/ChromaSearch.py | 4 +++- .../base/langflow/components/vectorsearch/CouchbaseSearch.py | 2 +- .../base/langflow/components/vectorsearch/FAISSSearch.py | 2 +- .../components/vectorsearch/MongoDBAtlasVectorSearch.py | 2 +- .../base/langflow/components/vectorsearch/PineconeSearch.py | 2 +- .../base/langflow/components/vectorsearch/QdrantSearch.py | 2 +- .../base/langflow/components/vectorsearch/RedisSearch.py | 2 +- .../components/vectorsearch/SupabaseVectorStoreSearch.py | 2 +- .../base/langflow/components/vectorsearch/UpstashSearch.py | 2 +- .../base/langflow/components/vectorsearch/VectaraSearch.py | 2 +- .../base/langflow/components/vectorsearch/WeaviateSearch.py | 2 +- .../base/langflow/components/vectorsearch/pgvectorSearch.py | 2 +- src/backend/base/langflow/components/vectorstores/Chroma.py | 5 +++-- .../base/langflow/components/vectorstores/base/__init__.py | 3 --- 17 files changed, 19 insertions(+), 19 deletions(-) rename src/backend/base/langflow/{components/vectorstores/base => base/vectorstores}/model.py (100%) delete mode 100644 src/backend/base/langflow/components/vectorstores/base/__init__.py diff --git a/src/backend/base/langflow/components/vectorstores/base/model.py b/src/backend/base/langflow/base/vectorstores/model.py similarity index 100% rename from src/backend/base/langflow/components/vectorstores/base/model.py rename to src/backend/base/langflow/base/vectorstores/model.py diff --git a/src/backend/base/langflow/components/vectorsearch/AstraDBSearch.py b/src/backend/base/langflow/components/vectorsearch/AstraDBSearch.py index bad713533..0de882841 100644 --- a/src/backend/base/langflow/components/vectorsearch/AstraDBSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/AstraDBSearch.py @@ -1,7 +1,7 @@ from typing import List, Optional +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.components.vectorstores.AstraDB import AstraVectorStoreComponent -from langflow.components.vectorstores.base.model import LCVectorStoreComponent from langflow.field_typing import Embeddings, Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/CassandraSearch.py b/src/backend/base/langflow/components/vectorsearch/CassandraSearch.py index b656b99a8..38257a84a 100644 --- a/src/backend/base/langflow/components/vectorsearch/CassandraSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/CassandraSearch.py @@ -2,7 +2,7 @@ from typing import Any, List, Optional, Tuple from langchain_community.utilities.cassandra import SetupMode -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.components.vectorstores.Cassandra import CassandraVectorStoreComponent from langflow.field_typing import Embeddings, Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/ChromaSearch.py b/src/backend/base/langflow/components/vectorsearch/ChromaSearch.py index 475d67a17..f0ffbbca9 100644 --- a/src/backend/base/langflow/components/vectorsearch/ChromaSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/ChromaSearch.py @@ -3,7 +3,9 @@ from typing import List, Optional import chromadb from chromadb.config import Settings from langchain_chroma import Chroma -from langflow.components.vectorstores.base.model import LCVectorStoreComponent + + +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.field_typing import Embeddings, Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/CouchbaseSearch.py b/src/backend/base/langflow/components/vectorsearch/CouchbaseSearch.py index 780113560..45d3f23c3 100644 --- a/src/backend/base/langflow/components/vectorsearch/CouchbaseSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/CouchbaseSearch.py @@ -1,6 +1,6 @@ from typing import List -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.components.vectorstores.Couchbase import CouchbaseVectorStoreComponent from langflow.field_typing import Embeddings, Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/FAISSSearch.py b/src/backend/base/langflow/components/vectorsearch/FAISSSearch.py index 681c112dd..b76377b3f 100644 --- a/src/backend/base/langflow/components/vectorsearch/FAISSSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/FAISSSearch.py @@ -2,7 +2,7 @@ from typing import List from langchain_community.vectorstores.faiss import FAISS -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.field_typing import Embeddings, Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/MongoDBAtlasVectorSearch.py b/src/backend/base/langflow/components/vectorsearch/MongoDBAtlasVectorSearch.py index 7dc94b05f..436f49419 100644 --- a/src/backend/base/langflow/components/vectorsearch/MongoDBAtlasVectorSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/MongoDBAtlasVectorSearch.py @@ -1,6 +1,6 @@ from typing import List, Optional -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.components.vectorstores.MongoDBAtlasVector import MongoVectorStoreComponent from langflow.field_typing import Embeddings, NestedDict, Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/PineconeSearch.py b/src/backend/base/langflow/components/vectorsearch/PineconeSearch.py index 10b6d4361..55c11d44d 100644 --- a/src/backend/base/langflow/components/vectorsearch/PineconeSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/PineconeSearch.py @@ -2,7 +2,7 @@ from typing import List, Optional from langchain_pinecone._utilities import DistanceStrategy -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.components.vectorstores.Pinecone import PineconeVectorStoreComponent from langflow.field_typing import Embeddings, Text from langflow.field_typing.constants import NestedDict diff --git a/src/backend/base/langflow/components/vectorsearch/QdrantSearch.py b/src/backend/base/langflow/components/vectorsearch/QdrantSearch.py index d0b41f23f..3e0613f7c 100644 --- a/src/backend/base/langflow/components/vectorsearch/QdrantSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/QdrantSearch.py @@ -1,6 +1,6 @@ from typing import List, Optional -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.components.vectorstores.Qdrant import QdrantVectorStoreComponent from langflow.field_typing import Embeddings, NestedDict, Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/RedisSearch.py b/src/backend/base/langflow/components/vectorsearch/RedisSearch.py index bd88b6893..097c32f4c 100644 --- a/src/backend/base/langflow/components/vectorsearch/RedisSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/RedisSearch.py @@ -2,7 +2,7 @@ from typing import List, Optional from langchain_core.embeddings import Embeddings -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.components.vectorstores.Redis import RedisVectorStoreComponent from langflow.field_typing import Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/SupabaseVectorStoreSearch.py b/src/backend/base/langflow/components/vectorsearch/SupabaseVectorStoreSearch.py index 4617d3e44..8fcd485f0 100644 --- a/src/backend/base/langflow/components/vectorsearch/SupabaseVectorStoreSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/SupabaseVectorStoreSearch.py @@ -3,7 +3,7 @@ from typing import List from langchain_community.vectorstores.supabase import SupabaseVectorStore from supabase.client import Client, create_client -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.field_typing import Embeddings, Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/UpstashSearch.py b/src/backend/base/langflow/components/vectorsearch/UpstashSearch.py index 93490b83c..cf778ed7a 100644 --- a/src/backend/base/langflow/components/vectorsearch/UpstashSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/UpstashSearch.py @@ -2,7 +2,7 @@ from typing import List, Optional from langchain_core.embeddings import Embeddings -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.components.vectorstores.Upstash import UpstashVectorStoreComponent from langflow.field_typing import Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/VectaraSearch.py b/src/backend/base/langflow/components/vectorsearch/VectaraSearch.py index a77b9c5c2..38888d8ac 100644 --- a/src/backend/base/langflow/components/vectorsearch/VectaraSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/VectaraSearch.py @@ -2,7 +2,7 @@ from typing import List from langchain_community.vectorstores.vectara import Vectara -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.components.vectorstores.Vectara import VectaraVectorStoreComponent from langflow.field_typing import Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/WeaviateSearch.py b/src/backend/base/langflow/components/vectorsearch/WeaviateSearch.py index f29363e57..db5c0a738 100644 --- a/src/backend/base/langflow/components/vectorsearch/WeaviateSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/WeaviateSearch.py @@ -2,7 +2,7 @@ from typing import List, Optional from langchain_core.embeddings import Embeddings -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.components.vectorstores.Weaviate import WeaviateVectorStoreComponent from langflow.field_typing import Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorsearch/pgvectorSearch.py b/src/backend/base/langflow/components/vectorsearch/pgvectorSearch.py index 34e6bb9d6..5e7a171b5 100644 --- a/src/backend/base/langflow/components/vectorsearch/pgvectorSearch.py +++ b/src/backend/base/langflow/components/vectorsearch/pgvectorSearch.py @@ -2,7 +2,7 @@ from typing import List from langchain_core.embeddings import Embeddings -from langflow.components.vectorstores.base.model import LCVectorStoreComponent +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.components.vectorstores.pgvector import PGVectorStoreComponent from langflow.field_typing import Text from langflow.schema import Data diff --git a/src/backend/base/langflow/components/vectorstores/Chroma.py b/src/backend/base/langflow/components/vectorstores/Chroma.py index 7ab97fe08..ea58284d7 100644 --- a/src/backend/base/langflow/components/vectorstores/Chroma.py +++ b/src/backend/base/langflow/components/vectorstores/Chroma.py @@ -5,9 +5,10 @@ from chromadb.config import Settings from langchain_chroma.vectorstores import Chroma from loguru import logger +from langflow.base.vectorstores.model import LCVectorStoreComponent from langflow.base.vectorstores.utils import chroma_collection_to_data -from langflow.components.vectorstores.base.model import LCVectorStoreComponent -from langflow.inputs import BoolInput, DropdownInput, HandleInput, IntInput, StrInput, MessageInput, DataInput +from langflow.inputs import BoolInput, DataInput, DropdownInput, HandleInput, IntInput, MessageInput, StrInput + IntInput, MessageInput, StrInput) from langflow.schema import Data if TYPE_CHECKING: diff --git a/src/backend/base/langflow/components/vectorstores/base/__init__.py b/src/backend/base/langflow/components/vectorstores/base/__init__.py deleted file mode 100644 index 93e42c4aa..000000000 --- a/src/backend/base/langflow/components/vectorstores/base/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from .model import LCVectorStoreComponent - -__all__ = ["LCVectorStoreComponent"]