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

bugfix: Properly log and set metric to none by default in Astra DB Component (#4390)

Browse source 
* bugfix: Properly log and set metric to none by default

* Update Vector Store RAG.json

* Update astradb.py
This commit is contained in:
Eric Hare 2024-11-04 17:41:16 -08:00 • committed by GitHub
commit b6e8d41c77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,6 @@ import os
import orjson import orjson
from astrapy.admin import parse_api_endpoint from astrapy.admin import parse_api_endpoint
from loguru import logger
from langflow.base.vectorstores.model import LCVectorStoreComponent, check_cached_vector_store from langflow.base.vectorstores.model import LCVectorStoreComponent, check_cached_vector_store
from langflow.helpers import docs_to_data from langflow.helpers import docs_to_data
@ -219,7 +218,7 @@ class AstraVectorStoreComponent(LCVectorStoreComponent):
# Find the index of the key to insert after # Find the index of the key to insert after
idx = len(items) idx = len(items)
for i, (key, _value) in enumerate(items): for i, (key, _) in enumerate(items):
if key == field_name: if key == field_name:
idx = i + 1 idx = i + 1
break break
@ -412,8 +411,8 @@ class AstraVectorStoreComponent(LCVectorStoreComponent):
token=self.token, token=self.token,
api_endpoint=self.api_endpoint, api_endpoint=self.api_endpoint,
namespace=self.namespace or None, namespace=self.namespace or None,
environment=parse_api_endpoint(self.api_endpoint).environment, environment=parse_api_endpoint(self.api_endpoint).environment if self.api_endpoint else None,
metric=self.metric, metric=self.metric or None,
batch_size=self.batch_size or None, batch_size=self.batch_size or None,
bulk_insert_batch_concurrency=self.bulk_insert_batch_concurrency 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_insert_overwrite_concurrency=self.bulk_insert_overwrite_concurrency or None,
@ -445,14 +444,14 @@ class AstraVectorStoreComponent(LCVectorStoreComponent):
raise TypeError(msg) raise TypeError(msg)
if documents: if documents:
logger.debug(f"Adding {len(documents)} documents to the Vector Store.") self.log(f"Adding {len(documents)} documents to the Vector Store.")
try: try:
vector_store.add_documents(documents) vector_store.add_documents(documents)
except Exception as e: except Exception as e:
msg = f"Error adding documents to AstraDBVectorStore: {e}" msg = f"Error adding documents to AstraDBVectorStore: {e}"
raise ValueError(msg) from e raise ValueError(msg) from e
else: else:
logger.debug("No documents to add to the Vector Store.") self.log("No documents to add to the Vector Store.")
def _map_search_type(self) -> str: def _map_search_type(self) -> str:
if self.search_type == "Similarity with score threshold": if self.search_type == "Similarity with score threshold":
@ -477,9 +476,9 @@ class AstraVectorStoreComponent(LCVectorStoreComponent):
if not vector_store: if not vector_store:
vector_store = self.build_vector_store() vector_store = self.build_vector_store()
logger.debug(f"Search input: {self.search_input}") self.log(f"Search input: {self.search_input}")
logger.debug(f"Search type: {self.search_type}") self.log(f"Search type: {self.search_type}")
logger.debug(f"Number of results: {self.number_of_results}") self.log(f"Number of results: {self.number_of_results}")
if self.search_input and isinstance(self.search_input, str) and self.search_input.strip(): if self.search_input and isinstance(self.search_input, str) and self.search_input.strip():
try: try:
@ -491,13 +490,13 @@ class AstraVectorStoreComponent(LCVectorStoreComponent):
msg = f"Error performing search in AstraDBVectorStore: {e}" msg = f"Error performing search in AstraDBVectorStore: {e}"
raise ValueError(msg) from e raise ValueError(msg) from e
logger.debug(f"Retrieved documents: {len(docs)}") self.log(f"Retrieved documents: {len(docs)}")
data = docs_to_data(docs) data = docs_to_data(docs)
logger.debug(f"Converted documents to data: {len(data)}") self.log(f"Converted documents to data: {len(data)}")
self.status = data self.status = data
return data return data
logger.debug("No search input provided. Skipping search.") self.log("No search input provided. Skipping search.")
return [] return []
def get_retriever_kwargs(self): def get_retriever_kwargs(self):

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

@ -889,7 +889,7 @@
"title_case": false, "title_case": false,
"trace_as_metadata": true, "trace_as_metadata": true,
"type": "str", "type": "str",
"value": "" "value": "cosine"
}, },
"namespace": { "namespace": {
"advanced": true, "advanced": true,
@ -2222,7 +2222,7 @@
"title_case": false, "title_case": false,
"trace_as_metadata": true, "trace_as_metadata": true,
"type": "str", "type": "str",
"value": "" "value": "cosine"
}, },
"namespace": { "namespace": {
"advanced": true, "advanced": true,