From 75836a478c371aa9bd354689b70a95184caaa1b6 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 20 Jun 2024 18:09:18 -0300 Subject: [PATCH] refactor: Remove unused build_base_retriever method from vector store components --- .../base/langflow/components/models/AmazonBedrockModel.py | 2 +- .../base/langflow/components/models/HuggingFaceModel.py | 2 +- src/backend/base/langflow/components/models/VertexAiModel.py | 1 + src/backend/base/langflow/components/vectorstores/AstraDB.py | 4 ---- .../base/langflow/components/vectorstores/Cassandra.py | 3 --- .../base/langflow/components/vectorstores/Couchbase.py | 3 --- .../langflow/components/vectorstores/MongoDBAtlasVector.py | 3 --- .../base/langflow/components/vectorstores/Pinecone.py | 5 +---- src/backend/base/langflow/components/vectorstores/Qdrant.py | 3 --- .../langflow/components/vectorstores/SupabaseVectorStore.py | 3 --- src/backend/base/langflow/components/vectorstores/Upstash.py | 3 --- .../base/langflow/components/vectorstores/Weaviate.py | 3 --- .../base/langflow/components/vectorstores/pgvector.py | 3 --- 13 files changed, 4 insertions(+), 34 deletions(-) diff --git a/src/backend/base/langflow/components/models/AmazonBedrockModel.py b/src/backend/base/langflow/components/models/AmazonBedrockModel.py index 2d5c434cd..ef4f8450b 100644 --- a/src/backend/base/langflow/components/models/AmazonBedrockModel.py +++ b/src/backend/base/langflow/components/models/AmazonBedrockModel.py @@ -78,7 +78,7 @@ class AmazonBedrockComponent(LCModelComponent): cache = self.cache stream = self.stream try: - output = ChatBedrock( + output = ChatBedrock( # type: ignore credentials_profile_name=credentials_profile_name, model_id=model_id, region_name=region_name, diff --git a/src/backend/base/langflow/components/models/HuggingFaceModel.py b/src/backend/base/langflow/components/models/HuggingFaceModel.py index a3ec98799..021f15793 100644 --- a/src/backend/base/langflow/components/models/HuggingFaceModel.py +++ b/src/backend/base/langflow/components/models/HuggingFaceModel.py @@ -43,7 +43,7 @@ class HuggingFaceEndpointsComponent(LCModelComponent): model_kwargs = self.model_kwargs or {} try: - llm = HuggingFaceEndpoint( + llm = HuggingFaceEndpoint( # type: ignore endpoint_url=endpoint_url, task=task, huggingfacehub_api_token=huggingfacehub_api_token, diff --git a/src/backend/base/langflow/components/models/VertexAiModel.py b/src/backend/base/langflow/components/models/VertexAiModel.py index 63438b49f..fb06ac5f2 100644 --- a/src/backend/base/langflow/components/models/VertexAiModel.py +++ b/src/backend/base/langflow/components/models/VertexAiModel.py @@ -1,5 +1,6 @@ from langchain_google_vertexai import ChatVertexAI +from langflow.base.constants import STREAM_INFO_TEXT from langflow.base.models.model import LCModelComponent from langflow.field_typing import LanguageModel from langflow.io import BoolInput, FileInput, FloatInput, IntInput, MessageInput, MultilineInput, Output, StrInput diff --git a/src/backend/base/langflow/components/vectorstores/AstraDB.py b/src/backend/base/langflow/components/vectorstores/AstraDB.py index 8c757cb1d..2be70ac80 100644 --- a/src/backend/base/langflow/components/vectorstores/AstraDB.py +++ b/src/backend/base/langflow/components/vectorstores/AstraDB.py @@ -181,10 +181,6 @@ class AstraVectorStoreComponent(LCVectorStoreComponent): if self.add_to_vector_store: self._add_documents_to_vector_store(vector_store) - return vector_store - - def build_base_retriever(self): - vector_store = self.build_vector_store() self.status = self._astradb_collection_to_data(vector_store.collection) return vector_store diff --git a/src/backend/base/langflow/components/vectorstores/Cassandra.py b/src/backend/base/langflow/components/vectorstores/Cassandra.py index 480519581..04d80bdec 100644 --- a/src/backend/base/langflow/components/vectorstores/Cassandra.py +++ b/src/backend/base/langflow/components/vectorstores/Cassandra.py @@ -99,9 +99,6 @@ class CassandraVectorStoreComponent(Component): def build_vector_store(self) -> Cassandra: return self._build_cassandra() - def build_base_retriever(self) -> Retriever: - return self._build_cassandra() - def _build_cassandra(self) -> Cassandra: try: import cassio diff --git a/src/backend/base/langflow/components/vectorstores/Couchbase.py b/src/backend/base/langflow/components/vectorstores/Couchbase.py index 20332d79d..aa264d424 100644 --- a/src/backend/base/langflow/components/vectorstores/Couchbase.py +++ b/src/backend/base/langflow/components/vectorstores/Couchbase.py @@ -66,9 +66,6 @@ class CouchbaseVectorStoreComponent(Component): def build_vector_store(self) -> CouchbaseVectorStore: return self._build_couchbase() - def build_base_retriever(self) -> Retriever: - return self._build_couchbase() - def _build_couchbase(self) -> CouchbaseVectorStore: try: from couchbase.auth import PasswordAuthenticator # type: ignore diff --git a/src/backend/base/langflow/components/vectorstores/MongoDBAtlasVector.py b/src/backend/base/langflow/components/vectorstores/MongoDBAtlasVector.py index 0124805ef..a679f2303 100644 --- a/src/backend/base/langflow/components/vectorstores/MongoDBAtlasVector.py +++ b/src/backend/base/langflow/components/vectorstores/MongoDBAtlasVector.py @@ -63,9 +63,6 @@ class MongoVectorStoreComponent(Component): def build_vector_store(self) -> MongoDBAtlasVectorSearch: return self._build_mongodb_atlas() - def build_base_retriever(self) -> Retriever: - return self._build_mongodb_atlas() - def _build_mongodb_atlas(self) -> MongoDBAtlasVectorSearch: try: from pymongo import MongoClient diff --git a/src/backend/base/langflow/components/vectorstores/Pinecone.py b/src/backend/base/langflow/components/vectorstores/Pinecone.py index 91c87d258..a98ad73fc 100644 --- a/src/backend/base/langflow/components/vectorstores/Pinecone.py +++ b/src/backend/base/langflow/components/vectorstores/Pinecone.py @@ -67,10 +67,7 @@ class PineconeVectorStoreComponent(Component): Output(display_name="Search Results", name="search_results", method="search_documents"), ] - def build_vector_store(self) -> Pinecone: - return self._build_pinecone() - - def build_base_retriever(self) -> Retriever: + def build_vector_store(self) -> Retriever: return self._build_pinecone() def _build_pinecone(self) -> Pinecone: diff --git a/src/backend/base/langflow/components/vectorstores/Qdrant.py b/src/backend/base/langflow/components/vectorstores/Qdrant.py index 1515b4c4b..d90d44f68 100644 --- a/src/backend/base/langflow/components/vectorstores/Qdrant.py +++ b/src/backend/base/langflow/components/vectorstores/Qdrant.py @@ -71,9 +71,6 @@ class QdrantVectorStoreComponent(Component): def build_vector_store(self) -> Qdrant: return self._build_qdrant() - def build_base_retriever(self) -> Retriever: - return self._build_qdrant() - def _build_qdrant(self) -> Qdrant: qdrant_kwargs = { "collection_name": self.collection_name, diff --git a/src/backend/base/langflow/components/vectorstores/SupabaseVectorStore.py b/src/backend/base/langflow/components/vectorstores/SupabaseVectorStore.py index 6bd17e9fe..151ebee86 100644 --- a/src/backend/base/langflow/components/vectorstores/SupabaseVectorStore.py +++ b/src/backend/base/langflow/components/vectorstores/SupabaseVectorStore.py @@ -58,9 +58,6 @@ class SupabaseVectorStoreComponent(Component): def build_vector_store(self) -> SupabaseVectorStore: return self._build_supabase() - def build_base_retriever(self) -> Retriever: - return self._build_supabase() - def _build_supabase(self) -> SupabaseVectorStore: supabase: Client = create_client(self.supabase_url, supabase_key=self.supabase_service_key) diff --git a/src/backend/base/langflow/components/vectorstores/Upstash.py b/src/backend/base/langflow/components/vectorstores/Upstash.py index a9b5e36fb..6850f7f5c 100644 --- a/src/backend/base/langflow/components/vectorstores/Upstash.py +++ b/src/backend/base/langflow/components/vectorstores/Upstash.py @@ -74,9 +74,6 @@ class UpstashVectorStoreComponent(Component): def build_vector_store(self) -> UpstashVectorStore: return self._build_upstash() - def build_base_retriever(self) -> Retriever: - return self._build_upstash() - def _build_upstash(self) -> UpstashVectorStore: use_upstash_embedding = self.embedding is None diff --git a/src/backend/base/langflow/components/vectorstores/Weaviate.py b/src/backend/base/langflow/components/vectorstores/Weaviate.py index 3d853ad2c..3ebb0e236 100644 --- a/src/backend/base/langflow/components/vectorstores/Weaviate.py +++ b/src/backend/base/langflow/components/vectorstores/Weaviate.py @@ -59,9 +59,6 @@ class WeaviateVectorStoreComponent(Component): def build_vector_store(self) -> Weaviate: return self._build_weaviate() - def build_base_retriever(self) -> Retriever: - return self._build_weaviate() - def _build_weaviate(self) -> Weaviate: if self.api_key: auth_config = weaviate.AuthApiKey(api_key=self.api_key) diff --git a/src/backend/base/langflow/components/vectorstores/pgvector.py b/src/backend/base/langflow/components/vectorstores/pgvector.py index 59b8707e6..1e6006413 100644 --- a/src/backend/base/langflow/components/vectorstores/pgvector.py +++ b/src/backend/base/langflow/components/vectorstores/pgvector.py @@ -56,9 +56,6 @@ class PGVectorStoreComponent(Component): def build_vector_store(self) -> PGVector: return self._build_pgvector() - def build_base_retriever(self) -> Retriever: - return self._build_pgvector() - def _build_pgvector(self) -> PGVector: if self.add_to_vector_store: documents = []