Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
♻️ Update pre-start scripts to use SQLModel session
  • Loading branch information
tiangolo committed Nov 24, 2023
commit 09fd4714aab8f55022901c07fdbae7ae14fc5bab
9 changes: 5 additions & 4 deletions src/backend/app/app/backend_pre_start.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import logging

from sqlmodel import Session, select
from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed

from app.db.session import SessionLocal
from app.db.engine import engine

logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__)
Expand All @@ -19,9 +20,9 @@
)
def init() -> None:
try:
db = SessionLocal()
# Try to create session to check if DB is awake
db.execute("SELECT 1")
with Session(engine) as session:
# Try to create session to check if DB is awake
session.exec(select(1))
except Exception as e:
logger.error(e)
raise e
Expand Down
7 changes: 4 additions & 3 deletions src/backend/app/app/celeryworker_pre_start.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import logging

from sqlmodel import Session, select
from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed

from app.db.session import SessionLocal
from app.db.engine import engine

logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__)
Expand All @@ -20,8 +21,8 @@
def init() -> None:
try:
# Try to create session to check if DB is awake
db = SessionLocal()
db.execute("SELECT 1")
with Session(engine) as session:
session.exec(select(1))
except Exception as e:
logger.error(e)
raise e
Expand Down
8 changes: 5 additions & 3 deletions src/backend/app/app/initial_data.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import logging

from sqlmodel import Session

from app.db.engine import engine
from app.db.init_db import init_db
from app.db.session import SessionLocal

logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__)


def init() -> None:
db = SessionLocal()
init_db(db)
with Session(engine) as session:
init_db(session)


def main() -> None:
Expand Down
7 changes: 4 additions & 3 deletions src/backend/app/app/tests_pre_start.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import logging

from sqlmodel import Session, select
from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed

from app.db.session import SessionLocal
from app.db.engine import engine

logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__)
Expand All @@ -20,8 +21,8 @@
def init() -> None:
try:
# Try to create session to check if DB is awake
db = SessionLocal()
db.execute("SELECT 1")
with Session(engine) as session:
session.exec(select(1))
except Exception as e:
logger.error(e)
raise e
Expand Down