jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: Fix Astra DB collection indexing params (#4255)

Browse source 
Fix Astra DB collection indexing params
This commit is contained in:
Christophe Bornet 2024-10-27 02:55:30 +01:00 • committed by GitHub
commit 1ef1fcb515
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/backend/base/langflow/components/vectorstores/astradb.py
View file

@ -1,5 +1,6 @@
import os import os
import orjson
from astrapy.admin import parse_api_endpoint from astrapy.admin import parse_api_endpoint
from loguru import logger from loguru import logger
@ -116,6 +117,7 @@ class AstraVectorStoreComponent(LCVectorStoreComponent):
display_name="Metric", display_name="Metric",
info="Optional distance metric for vector comparisons in the vector store.", info="Optional distance metric for vector comparisons in the vector store.",
options=["cosine", "dot_product", "euclidean"], options=["cosine", "dot_product", "euclidean"],
value="cosine",
advanced=True, advanced=True,
), ),
IntInput( IntInput(
@ -145,8 +147,8 @@ class AstraVectorStoreComponent(LCVectorStoreComponent):
DropdownInput( DropdownInput(
name="setup_mode", name="setup_mode",
display_name="Setup Mode", display_name="Setup Mode",
info="Configuration mode for setting up the vector store, with options like 'Sync', 'Async', or 'Off'.", info="Configuration mode for setting up the vector store, with options like 'Sync' or 'Off'.",
options=["Sync", "Async", "Off"], options=["Sync", "Off"],
advanced=True, advanced=True,
value="Sync", value="Sync",
), ),
@ -160,18 +162,21 @@ class AstraVectorStoreComponent(LCVectorStoreComponent):
name="metadata_indexing_include", name="metadata_indexing_include",
display_name="Metadata Indexing Include", display_name="Metadata Indexing Include",
info="Optional list of metadata fields to include in the indexing.", info="Optional list of metadata fields to include in the indexing.",
is_list=True,
advanced=True, advanced=True,
), ),
StrInput( StrInput(
name="metadata_indexing_exclude", name="metadata_indexing_exclude",
display_name="Metadata Indexing Exclude", display_name="Metadata Indexing Exclude",
info="Optional list of metadata fields to exclude from the indexing.", info="Optional list of metadata fields to exclude from the indexing.",
is_list=True,
advanced=True, advanced=True,
), ),
StrInput( StrInput(
name="collection_indexing_policy", name="collection_indexing_policy",
display_name="Collection Indexing Policy", display_name="Collection Indexing Policy",
info="Optional dictionary defining the indexing policy for the collection.", info='Optional JSON string for the "indexing" field of the collection. '
"See https://docs.datastax.com/en/astra-db-serverless/api-reference/collections.html#the-indexing-option",
advanced=True, advanced=True,
), ),
IntInput( IntInput(
@ -401,31 +406,27 @@ class AstraVectorStoreComponent(LCVectorStoreComponent):
), ),
} }
vector_store_kwargs = {
**embedding_dict,
"collection_name": self.collection_name,
"token": self.token,
"api_endpoint": self.api_endpoint,
"namespace": self.namespace or None,
"environment": parse_api_endpoint(self.api_endpoint).environment,
"metric": self.metric or None,
"batch_size": self.batch_size or None,
"bulk_insert_batch_concurrency": self.bulk_insert_batch_concurrency or None,
"bulk_insert_overwrite_concurrency": self.bulk_insert_overwrite_concurrency or None,
"bulk_delete_concurrency": self.bulk_delete_concurrency or None,
"setup_mode": setup_mode_value,
"pre_delete_collection": self.pre_delete_collection or False,
}
if self.metadata_indexing_include:
vector_store_kwargs["metadata_indexing_include"] = self.metadata_indexing_include
elif self.metadata_indexing_exclude:
vector_store_kwargs["metadata_indexing_exclude"] = self.metadata_indexing_exclude
elif self.collection_indexing_policy:
vector_store_kwargs["collection_indexing_policy"] = self.collection_indexing_policy
try: try:
vector_store = AstraDBVectorStore(**vector_store_kwargs) vector_store = AstraDBVectorStore(
collection_name=self.collection_name,
token=self.token,
api_endpoint=self.api_endpoint,
namespace=self.namespace or None,
environment=parse_api_endpoint(self.api_endpoint).environment,
metric=self.metric,
batch_size=self.batch_size or None,
bulk_insert_batch_concurrency=self.bulk_insert_batch_concurrency or None,
bulk_insert_overwrite_concurrency=self.bulk_insert_overwrite_concurrency or None,
bulk_delete_concurrency=self.bulk_delete_concurrency or None,
setup_mode=setup_mode_value,
pre_delete_collection=self.pre_delete_collection,
metadata_indexing_include=[s for s in self.metadata_indexing_include if s],
metadata_indexing_exclude=[s for s in self.metadata_indexing_exclude if s],
collection_indexing_policy=orjson.dumps(self.collection_indexing_policy)
if self.collection_indexing_policy
else None,
**embedding_dict,
)
except Exception as e: except Exception as e:
msg = f"Error initializing AstraDBVectorStore: {e}" msg = f"Error initializing AstraDBVectorStore: {e}"
raise ValueError(msg) from e raise ValueError(msg) from e

22
src/backend/base/langflow/initial_setup/starter_projects/Vector Store RAG.json
View file

File diff suppressed because one or more lines are too long