edge cases caught

onyx-dot-app · Oct 2, 2024 · a57e25b · a57e25b
1 parent eecc72e
commit a57e25b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/backend/danswer/db/engine.py b/backend/danswer/db/engine.py
@@ -295,7 +295,6 @@ def get_session_with_tenant(
     tenant_id: str | None = None,
 ) -> Generator[Session, None, None]:
     """Generate a database session with the appropriate tenant schema set."""
-
     engine = get_sqlalchemy_engine()
     if tenant_id is None:
         tenant_id = current_tenant_id.get()

diff --git a/backend/danswer/db/search_settings.py b/backend/danswer/db/search_settings.py
@@ -12,7 +12,7 @@
 from danswer.configs.model_configs import OLD_DEFAULT_DOCUMENT_ENCODER_MODEL
 from danswer.configs.model_configs import OLD_DEFAULT_MODEL_DOC_EMBEDDING_DIM
 from danswer.configs.model_configs import OLD_DEFAULT_MODEL_NORMALIZE_EMBEDDINGS
-from danswer.db.engine import get_sqlalchemy_engine
+from danswer.db.engine import get_session_with_tenant
 from danswer.db.llm import fetch_embedding_provider
 from danswer.db.models import CloudEmbeddingProvider
 from danswer.db.models import IndexAttempt
@@ -152,7 +152,7 @@ def get_all_search_settings(db_session: Session) -> list[SearchSettings]:
 
 def get_multilingual_expansion(db_session: Session | None = None) -> list[str]:
     if db_session is None:
-        with Session(get_sqlalchemy_engine()) as db_session:
+        with get_session_with_tenant() as db_session:
             search_settings = get_current_search_settings(db_session)
     else:
         search_settings = get_current_search_settings(db_session)