♻ Refactor Python folder tree (#629)

Co-authored-by: Sebastián Ramírez <tiangolo@gmail.com>

src/backend/app/api/deps.py

@@ -9,7 +9,7 @@ from sqlmodel import Session
 
 from app.core import security
 from app.core.config import settings
-from app.db.engine import engine
+from app.core.db import engine
 from app.models import TokenPayload, User
 
 reusable_oauth2 = OAuth2PasswordBearer(

src/backend/app/api/main.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from app.api.api_v1.endpoints import items, login, users, utils
+from app.api.routes import items, login, users, utils
 
 api_router = APIRouter()
 api_router.include_router(login.router, tags=["login"])

src/backend/app/backend_pre_start.py

@@ -3,7 +3,7 @@ import logging
 from sqlmodel import Session, select
 from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed
 
-from app.db.engine import engine
+from app.core.db import engine
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)

src/backend/app/celeryworker_pre_start.py

@@ -3,7 +3,7 @@ import logging
 from sqlmodel import Session, select
 from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed
 
-from app.db.engine import engine
+from app.core.db import engine
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)

src/backend/app/core/db.py

@@ -1,8 +1,11 @@
-from sqlmodel import Session, select
+from sqlmodel import Session, create_engine, select
 
 from app import crud
 from app.core.config import settings
-from app.models import User, UserCreate  # noqa: F401
+from app.models import User, UserCreate
+
+engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI))
+
 
 # make sure all SQLModel models are imported (app.models) before initializing DB
 # otherwise, SQLModel might fail to initialize relationships properly
@@ -15,7 +18,7 @@ def init_db(session: Session) -> None:
     # the tables un-commenting the next lines
     # from sqlmodel import SQLModel
 
-    # from app.db.engine import engine
+    # from app.core.engine import engine
     # This works because the models are already imported and registered from app.models
     # SQLModel.metadata.create_all(engine)
 

src/backend/app/db/engine.py

@@ -1,5 +0,0 @@
-from sqlmodel import create_engine
-
-from app.core.config import settings
-
-engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI))

src/backend/app/initial_data.py

@@ -2,8 +2,7 @@ import logging
 
 from sqlmodel import Session
 
-from app.db.engine import engine
+from app.core.db import engine, init_db
-from app.db.init_db import init_db
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)

src/backend/app/main.py

@@ -2,7 +2,7 @@ from fastapi import FastAPI
 from fastapi.routing import APIRoute
 from starlette.middleware.cors import CORSMiddleware
 
-from app.api.api_v1.api import api_router
+from app.api.main import api_router
 from app.core.config import settings
 
 

src/backend/app/tests/conftest.py

@@ -5,8 +5,7 @@ from fastapi.testclient import TestClient
 from sqlmodel import Session, delete
 
 from app.core.config import settings
-from app.db.engine import engine
+from app.core.db import engine, init_db
-from app.db.init_db import init_db
 from app.main import app
 from app.models import Item, User
 from app.tests.utils.user import authentication_token_from_email

src/backend/app/tests_pre_start.py

@@ -3,7 +3,7 @@ import logging
 from sqlmodel import Session, select
 from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed
 
-from app.db.engine import engine
+from app.core.db import engine
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)