refact: db implementation

Dockerfile

@@ -1,4 +1,4 @@
-FROM tiangolo/uvicorn-gunicorn-fastapi:python3.8
+FROM python:3.9-slim-buster
 
 WORKDIR /app
 

api/routes/audio.py

@@ -3,7 +3,7 @@
 from services import summary, sentiment_calculator, transcribe_audio
 from models.audio_analysis import AudioAnalysis
 from sqlalchemy.orm import Session
-from db.utils import get_db
+from db.services import get_db
 import os
 
 router = APIRouter()

db/services.py

@@ -0,0 +1,12 @@
+from db import session
+
+
+def create_tables():
+    return session.Base.metadata.create_all(bind=session.engine)
+
+def get_db():
+    db = session.SessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()

db/session.py

@@ -1,11 +1,10 @@
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
-from sqlalchemy.ext.declarative import declarative_base
-from config import DATABASE_URL
+import sqlalchemy as _sql
+import sqlalchemy.ext.declarative as _declarative
+import sqlalchemy.orm as _orm
+import config
 
+engine = _sql.create_engine(config.DATABASE_URL)
 
-engine = create_engine(DATABASE_URL)
+SessionLocal = _orm.sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
-SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
-
-Base = declarative_base()
+Base = _declarative.declarative_base()

docker-compose.yml

@@ -7,14 +7,14 @@ services:
     ports:
       - "8000:80"
     environment:
-      - DATABASE_URL=mysql+mysqlconnector://william:Al12N%23assr@localhost/sentimentAnalysis
+      - DATABASE_URL=mysql+mysqlconnector://william:Al12N%23assr@sentimentAnalysis-mysql/sentimentAnalysis
     depends_on:
       - db
 
   db:
     image: mysql:latest
     environment:
-      - MYSQL_ROOT_PASSWORD=@As12345678
+      - MYSQL_ROOT_PASSWORD=Al12N%23assr
       - MYSQL_DATABASE=sentimentAnalysis
-      - MYSQL_USER=william
-      - MYSQL_PASSWORD=Al12N#assr
+      - MYSQL_USER=root
+      - MYSQL_PASSWORD=Al12N%23assr

main.py

@@ -1,20 +1,12 @@
-from fastapi import FastAPI, Depends
+from fastapi import FastAPI
 from api.routes import audio
 from middlewares import cors_middleware
-from typing import Annotated
-from sqlalchemy.orm import Session
-from db.init_db import init_db
-from db.utils import get_db
+import db
 
+db.services.create_tables()
 
 app = FastAPI()
 
-@app.on_event("startup")
-async def startup_event():
-    init_db()
-
 cors_middleware.setup_cors(app)
 
-db_dependency = Annotated[Session, Depends(get_db)]
-
 app.include_router(audio.router)

requirements.txt

@@ -52,6 +52,7 @@ packaging==23.2
 Pillow==10.0.1
 proto-plus==1.22.3
 protobuf==4.21.12
+psycopg2-binary==2.9.9
 pyasn1==0.5.0
 pyasn1-modules==0.3.0
 pydantic==2.4.2