Enhance database connection settings and improve error handling in mood logging functions. Added pool_pre_ping and pool_recycle options to the SQLAlchemy engine. Implemented try-except blocks to handle SQLAlchemy errors during mood log and recommendation log creation.

app/db.py

@@ -9,7 +9,13 @@ class Base(DeclarativeBase):
 
 
 settings = get_settings()
-engine = create_engine(settings.database_url, echo=False, future=True)
+engine = create_engine(
+    settings.database_url,
+    echo=False,
+    future=True,
+    pool_pre_ping=True,
+    pool_recycle=300,
+)
 SessionLocal = sessionmaker(bind=engine, autoflush=False, autocommit=False, future=True)
 
 

app/main.py

@@ -6,6 +6,7 @@ from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel
 from PIL import Image
 from sqlalchemy.orm import Session
+from sqlalchemy.exc import SQLAlchemyError
 
 from .db import Base, engine, get_db
 from .models import MoodLog, RecommendationLog
@@ -82,27 +83,29 @@ def mood_from_text(
     label, score = analyze_text_emotion(body.text)
     track = recommend_track_for_emotion(label, source="text")
 
-    mood_log = MoodLog(
-        source="text",
-        raw_input=body.text[:512],
-        emotion_label=label,
-        emotion_score=score,
-    )
-    db.add(mood_log)
-    db.flush()
-
-    rec_log = None
-    track_id = None
-    if track:
-        track_id = track["id"]
-        rec_log = RecommendationLog(
-            user_id=None,
-            mood_id=mood_log.id,
-            spotify_track_id=track_id,
+    track_id = track.get("id") if track else None
+
+    try:
+        mood_log = MoodLog(
+            source="text",
+            raw_input=body.text[:512],
+            emotion_label=label,
+            emotion_score=score,
         )
-        db.add(rec_log)
+        db.add(mood_log)
+        db.flush()
+
+        if track_id:
+            rec_log = RecommendationLog(
+                user_id=None,
+                mood_id=mood_log.id,
+                spotify_track_id=track_id,
+            )
+            db.add(rec_log)
 
-    db.commit()
+        db.commit()
+    except SQLAlchemyError:
+        db.rollback()
 
     return RecommendationResponse(
         mood_label=label,
@@ -128,27 +131,29 @@ async def mood_from_face(
     label, score = analyze_face_emotion(image)
     track = recommend_track_for_emotion(label, source="face")
 
-    mood_log = MoodLog(
-        source="face",
-        raw_input=None,
-        emotion_label=label,
-        emotion_score=score,
-    )
-    db.add(mood_log)
-    db.flush()
-
-    rec_log = None
-    track_id = None
-    if track:
-        track_id = track["id"]
-        rec_log = RecommendationLog(
-            user_id=None,
-            mood_id=mood_log.id,
-            spotify_track_id=track_id,
-        )
-        db.add(rec_log)
+    track_id = track.get("id") if track else None
 
-    db.commit()
+    try:
+        mood_log = MoodLog(
+            source="face",
+            raw_input=None,
+            emotion_label=label,
+            emotion_score=score,
+        )
+        db.add(mood_log)
+        db.flush()
+
+        if track_id:
+            rec_log = RecommendationLog(
+                user_id=None,
+                mood_id=mood_log.id,
+                spotify_track_id=track_id,
+            )
+            db.add(rec_log)
+
+        db.commit()
+    except SQLAlchemyError:
+        db.rollback()
 
     return RecommendationResponse(
         mood_label=label,