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

Account for edge case in indexing times with connectors #2190 (#2190)

Browse Source
This commit is contained in:
pablodanswer
2024-08-30 14:07:07 -07:00
committed by GitHub
parent b952dbef42
commit f2e8680955
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
backend/danswer/background/indexing/run_indexing.py
View File

@ -118,19 +118,19 @@ def _run_indexing(
db_cc_pair = index_attempt.connector_credential_pair db_cc_pair = index_attempt.connector_credential_pair
db_connector = index_attempt.connector_credential_pair.connector db_connector = index_attempt.connector_credential_pair.connector
db_credential = index_attempt.connector_credential_pair.credential db_credential = index_attempt.connector_credential_pair.credential
earliest_index_time = (
db_connector.indexing_start.timestamp() if db_connector.indexing_start else 0
)
last_successful_index_time = ( last_successful_index_time = (
db_connector.indexing_start.timestamp() earliest_index_time
if index_attempt.from_beginning and db_connector.indexing_start is not None if index_attempt.from_beginning
else ( else get_last_successful_attempt_time(
0.0 connector_id=db_connector.id,
if index_attempt.from_beginning credential_id=db_credential.id,
else get_last_successful_attempt_time( earliest_index=earliest_index_time,
connector_id=db_connector.id, search_settings=index_attempt.search_settings,
credential_id=db_credential.id, db_session=db_session,
search_settings=index_attempt.search_settings,
db_session=db_session,
)
) )
) )

9
backend/danswer/db/connector_credential_pair.py
View File

@ -159,6 +159,7 @@ def get_connector_credential_pair_from_id(
def get_last_successful_attempt_time( def get_last_successful_attempt_time(
connector_id: int, connector_id: int,
credential_id: int, credential_id: int,
earliest_index: float,
search_settings: SearchSettings, search_settings: SearchSettings,
db_session: Session, db_session: Session,
) -> float: ) -> float:
@ -172,7 +173,7 @@ def get_last_successful_attempt_time(
connector_credential_pair is None connector_credential_pair is None
or connector_credential_pair.last_successful_index_time is None or connector_credential_pair.last_successful_index_time is None
): ):
return 0.0 return earliest_index
return connector_credential_pair.last_successful_index_time.timestamp() return connector_credential_pair.last_successful_index_time.timestamp()
@ -192,11 +193,9 @@ def get_last_successful_attempt_time(
.order_by(IndexAttempt.time_started.desc()) .order_by(IndexAttempt.time_started.desc())
.first() .first()
) )
if not attempt or not attempt.time_started: if not attempt or not attempt.time_started:
connector = fetch_connector_by_id(connector_id, db_session) return earliest_index
if connector and connector.indexing_start:
return connector.indexing_start.timestamp()
return 0.0
return attempt.time_started.timestamp() return attempt.time_started.timestamp()