highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-04-08 20:08:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

harden indexing-status endpoint against db changes happening in the background. Needs further improvement but OK for now. (#2338)

Browse Source
This commit is contained in:
rkuo-danswer 2024-09-05 13:09:33 -07:00 committed by GitHub
parent ebe3674ca7
commit 2d7b312e6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/danswer/server/documents/connector.py
View File

@ -387,7 +387,12 @@ def get_connector_indexing_status(
) -> list[ConnectorIndexingStatus]:
indexing_statuses: list[ConnectorIndexingStatus] = []
# TODO: make this one query
# NOTE: If the connector is deleting behind the scenes,
# accessing cc_pairs can be inconsistent and members like
# connector or credential may be None.
# Additional checks are done to make sure the connector and credential still exists.
# TODO: make this one query ... possibly eager load or wrap in a read transaction
# to avoid the complexity of trying to error check throughout the function
cc_pairs = get_connector_credential_pairs(
db_session=db_session,
user=user,
@ -440,6 +445,10 @@ def get_connector_indexing_status(
connector = cc_pair.connector
credential = cc_pair.credential
if not connector or not credential:
# This may happen if background deletion is happening
continue
latest_index_attempt = cc_pair_to_latest_index_attempt.get(
(connector.id, credential.id)
)