Eagerly load CCpair connectors (#3531)

* remove left over vim command

* eager loading

* Revert "remove left over vim command"

This reverts commit 184a134ae0.
This commit is contained in:
pablonyx
2024-12-29 10:58:38 -05:00
committed by GitHub
parent f4806da653
commit 9bffeb65af
2 changed files with 10 additions and 2 deletions

View File

@@ -7,6 +7,7 @@ from sqlalchemy import exists
from sqlalchemy import Select
from sqlalchemy import select
from sqlalchemy.orm import aliased
from sqlalchemy.orm import joinedload
from sqlalchemy.orm import Session
from onyx.configs.constants import DocumentSource
@@ -90,15 +91,22 @@ def get_connector_credential_pairs(
user: User | None = None,
get_editable: bool = True,
ids: list[int] | None = None,
eager_load_connector: bool = False,
) -> list[ConnectorCredentialPair]:
stmt = select(ConnectorCredentialPair).distinct()
if eager_load_connector:
stmt = stmt.options(joinedload(ConnectorCredentialPair.connector))
stmt = _add_user_filters(stmt, user, get_editable)
if not include_disabled:
stmt = stmt.where(
ConnectorCredentialPair.status == ConnectorCredentialPairStatus.ACTIVE
) # noqa
)
if ids:
stmt = stmt.where(ConnectorCredentialPair.id.in_(ids))
return list(db_session.scalars(stmt).all())

View File

@@ -1058,7 +1058,7 @@ def get_basic_connector_indexing_status(
_: User = Depends(current_user),
db_session: Session = Depends(get_session),
) -> list[BasicCCPairInfo]:
cc_pairs = get_connector_credential_pairs(db_session)
cc_pairs = get_connector_credential_pairs(db_session, eager_load_connector=True)
return [
BasicCCPairInfo(
has_successful_run=cc_pair.last_successful_index_time is not None,