Change the way we get sqlalchemy session (#1940)

* changed default fast model to gpt-4o-mini

* Changed the way we get the sqlalchemy session
This commit is contained in:
hagen-danswer
2024-07-25 11:36:14 -07:00
committed by GitHub
parent c9fb99d719
commit a40d2a1e2e

View File

@@ -52,6 +52,7 @@ from danswer.db.auth import get_default_admin_user_emails
from danswer.db.auth import get_user_count from danswer.db.auth import get_user_count
from danswer.db.auth import get_user_db from danswer.db.auth import get_user_db
from danswer.db.engine import get_session from danswer.db.engine import get_session
from danswer.db.engine import get_sqlalchemy_engine
from danswer.db.models import AccessToken from danswer.db.models import AccessToken
from danswer.db.models import User from danswer.db.models import User
from danswer.db.users import get_user_by_email from danswer.db.users import get_user_by_email
@@ -101,12 +102,10 @@ def verify_email_is_invited(email: str) -> None:
raise PermissionError("User not on allowed user whitelist") raise PermissionError("User not on allowed user whitelist")
def verify_email_in_whitelist( def verify_email_in_whitelist(email: str) -> None:
email: str, with Session(get_sqlalchemy_engine()) as db_session:
db_session: Session = Depends(get_session), if not get_user_by_email(email, db_session):
) -> None: verify_email_is_invited(email)
if not get_user_by_email(email, db_session):
verify_email_is_invited(email)
def verify_email_domain(email: str) -> None: def verify_email_domain(email: str) -> None: