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

Fix fetching of latest index attempt

Browse Source
This commit is contained in:
Weves
2023-08-12 17:06:57 -07:00
committed by Chris Weaver
parent 95f52a26df
commit 156ccc15a8
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,7 +109,9 @@ def get_latest_index_attempts(
db_session: Session, db_session: Session,
) -> Sequence[IndexAttempt]: ) -> Sequence[IndexAttempt]:
ids_stmt = select( ids_stmt = select(
IndexAttempt.id, func.max(IndexAttempt.time_created).label("max_updated_at") IndexAttempt.connector_id,
IndexAttempt.credential_id,
func.max(IndexAttempt.time_created).label("max_time_created"),
) )
where_stmts: list[ColumnElement] = [] where_stmts: list[ColumnElement] = []
@@ -124,10 +126,20 @@ def get_latest_index_attempts(
) )
if where_stmts: if where_stmts:
ids_stmt = ids_stmt.where(or_(*where_stmts)) ids_stmt = ids_stmt.where(or_(*where_stmts))
ids_stmt = ids_stmt.group_by(IndexAttempt.id) ids_stmt = ids_stmt.group_by(IndexAttempt.connector_id, IndexAttempt.credential_id)
ids_subqery = ids_stmt.subquery() ids_subqery = ids_stmt.subquery()
stmt = select(IndexAttempt).join(ids_subqery, ids_subqery.c.id == IndexAttempt.id) stmt = (
select(IndexAttempt)
.join(
ids_subqery,
and_(
ids_subqery.c.connector_id == IndexAttempt.connector_id,
ids_subqery.c.credential_id == IndexAttempt.credential_id,
),
)
.where(IndexAttempt.time_created == ids_subqery.c.max_time_created)
)
return db_session.execute(stmt).scalars().all() return db_session.execute(stmt).scalars().all()