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

Bugfix/indexing progress (#1916)

Browse Source 
* mark in progress should always be committed

* no_commit version of mark_attempt is not needed
This commit is contained in:
rkuo-danswer
2024-07-24 11:39:44 -07:00
committed by GitHub
parent 91be8e7bfb
commit 7057be6a88
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ from danswer.db.connector_credential_pair import update_connector_credential_pai
from danswer.db.engine import get_sqlalchemy_engine from danswer.db.engine import get_sqlalchemy_engine
from danswer.db.index_attempt import get_index_attempt from danswer.db.index_attempt import get_index_attempt
from danswer.db.index_attempt import mark_attempt_failed from danswer.db.index_attempt import mark_attempt_failed
from danswer.db.index_attempt import mark_attempt_in_progress__no_commit from danswer.db.index_attempt import mark_attempt_in_progress
from danswer.db.index_attempt import mark_attempt_succeeded from danswer.db.index_attempt import mark_attempt_succeeded
from danswer.db.index_attempt import update_docs_indexed from danswer.db.index_attempt import update_docs_indexed
from danswer.db.models import IndexAttempt from danswer.db.models import IndexAttempt
@@ -299,9 +299,7 @@ def _prepare_index_attempt(db_session: Session, index_attempt_id: int) -> IndexA
) )
# only commit once, to make sure this all happens in a single transaction # only commit once, to make sure this all happens in a single transaction
mark_attempt_in_progress__no_commit(attempt) mark_attempt_in_progress(attempt, db_session)
if attempt.embedding_model.status != IndexModelStatus.PRESENT:
db_session.commit()
return attempt return attempt

4
backend/danswer/db/index_attempt.py
View File

@@ -75,11 +75,13 @@ def get_not_started_index_attempts(db_session: Session) -> list[IndexAttempt]:
return list(new_attempts.all()) return list(new_attempts.all())
def mark_attempt_in_progress__no_commit( def mark_attempt_in_progress(
index_attempt: IndexAttempt, index_attempt: IndexAttempt,
db_session: Session,
) -> None: ) -> None:
index_attempt.status = IndexingStatus.IN_PROGRESS index_attempt.status = IndexingStatus.IN_PROGRESS
index_attempt.time_started = index_attempt.time_started or func.now() # type: ignore index_attempt.time_started = index_attempt.time_started or func.now() # type: ignore
db_session.commit()
def mark_attempt_succeeded( def mark_attempt_succeeded(