Update app.py

app.py

@@ -10,17 +10,19 @@ from openai import OpenAI
 from pydantic import BaseModel
 from pymongo import MongoClient
 
+# Load .env variables
 load_dotenv()
 
 MONGO_URI = os.getenv("MONGO_URI")
 OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
 
 if not MONGO_URI:
-    raise RuntimeError("MONGO_URI missing in environment variables")
+    raise RuntimeError("❌ MONGO_URI missing in environment variables")
 
 if not OPENAI_API_KEY:
-    raise RuntimeError("OPENAI_API_KEY missing in environment variables")
+    raise RuntimeError("❌ OPENAI_API_KEY missing in environment variables")
 
+# MongoDB Setup
 mongo_client = MongoClient(MONGO_URI)
 default_db = mongo_client.get_default_database()
 if default_db is None:
@@ -29,17 +31,20 @@ if default_db is None:
 budget_collection = default_db["budget"]
 transaction_collection = default_db["transactions"]
 
+# OpenAI Client
 openai = OpenAI(api_key=OPENAI_API_KEY)
+
+# FastAPI App
 app = FastAPI(title="Financial Health Score Service")
 
 
+# Request Model
 class ScoreRequest(BaseModel):
     userId: str
 
 
+# Helpers
 def safe_number(value):
-    if isinstance(value, (int, float)):
-        return value
     try:
         return float(value)
     except Exception:
@@ -49,8 +54,9 @@ def safe_number(value):
 def normalize_budgets(budgets):
     normalized = []
     for budget in budgets:
-        head_categories = []
         heads = budget.get("headCategories") or []
+        head_categories = []
+
         if isinstance(heads, list):
             for head in heads:
                 head_categories.append({
@@ -72,16 +78,17 @@ def normalize_budgets(budgets):
             "notifications": budget.get("notifications") or [],
             "headCategories": head_categories,
         })
+
     return normalized
 
 
 def normalize_transactions(transactions):
     trimmed = []
     for txn in transactions:
-        date_value = txn.get("date")
         date_str = None
-        if isinstance(date_value, datetime):
-            date_str = date_value.date().isoformat()
+        if isinstance(txn.get("date"), datetime):
+            date_str = txn["date"].date().isoformat()
+
         trimmed.append({
             "type": txn.get("type"),
             "amount": safe_number(txn.get("amount")),
@@ -92,7 +99,8 @@ def normalize_transactions(transactions):
 
 def score_prompt(budgets, transactions):
     return f"""
-You are a financial wellness expert. Using any available budgets and recent transactions below, rate the user's financial health on a scale of 0-100.
+You are a financial wellness expert. Using any available budgets and recent transactions below,
+rate the user's financial health on a scale of 0–100.
 
 Budgets:
 {json.dumps(normalize_budgets(budgets), indent=2)}
@@ -100,11 +108,15 @@ Budgets:
 Transactions (last 30 days):
 {json.dumps(normalize_transactions(transactions), indent=2)}
 
-Respond ONLY with: {{"score": number, "explanation": "text"}}
+Respond ONLY with:
+{{"score": number, "explanation": "short explanation"}}
 """
 
 
 def extract_json_payload(text):
+    """
+    Removes markdown fences and extracts pure JSON.
+    """
     trimmed = (text or "").strip()
     match = re.search(r"```(?:json)?\s*([\s\S]*?)```", trimmed)
     payload = match.group(1).strip() if match else trimmed
@@ -118,37 +130,75 @@ def root():
 
 @app.post("/financial-score")
 def financial_score(payload: ScoreRequest):
+    # Validate userId
     try:
         user_id = ObjectId(payload.userId)
     except Exception:
         raise HTTPException(status_code=400, detail="Invalid userId")
 
+    # Fetch budgets
     budgets = list(budget_collection.find({"createdBy": user_id}))
+
+    # Fetch transactions (last 30 days)
     thirty_days_ago = datetime.utcnow() - timedelta(days=30)
     transactions = list(
         transaction_collection.find({
             "user": user_id,
-            "date": {"$gte": thirty_days_ago},
+            "date": {"$gte": thirty_days_ago}
         }).sort("date", -1).limit(100)
     )
 
+    # No data fallback
     if not budgets and not transactions:
         return {
             "userId": payload.userId,
             "score": 0,
-            "explanation": "No budgets or transactions found.",
+            "explanation": "No budgets or transactions found."
         }
 
-    response = openai.responses.create(
-        model="gpt-4o-mini",
-        input=score_prompt(budgets, transactions),
-        temperature=0.6,
-    )
-
-    model_output = response.output[0].content[0].text
-    parsed = extract_json_payload(model_output)
+    # Build LLM Prompt
+    prompt = score_prompt(budgets, transactions)
 
-    score = max(0, min(100, int(parsed["score"])))
-    explanation = parsed["explanation"]
+    # Call OpenAI (new SDK)
+    try:
+        response = openai.chat.completions.create(
+            model="gpt-4o-mini",
+            temperature=0.6,
+            messages=[{"role": "user", "content": prompt}],
+        )
+    except Exception as exc:
+        raise HTTPException(status_code=502, detail=f"OpenAI request failed: {exc}")
+
+    # Extract content text
+    try:
+        model_output = response.choices[0].message["content"]
+    except Exception:
+        raise HTTPException(
+            status_code=502,
+            detail="Invalid response format from OpenAI"
+        )
 
-    return {"userId": payload.userId, "score": score, "explanation": explanation}
+    # Parse JSON response
+    try:
+        parsed = extract_json_payload(model_output)
+    except Exception:
+        raise HTTPException(
+            status_code=502,
+            detail={"error": "Unable to parse OpenAI response", "rawResponse": model_output}
+        )
+
+    # Validate fields
+    if "score" not in parsed or "explanation" not in parsed:
+        raise HTTPException(
+            status_code=502,
+            detail={"error": "Invalid OpenAI response", "rawResponse": model_output}
+        )
+
+    # Clamp score 0–100
+    score_val = max(0, min(100, int(parsed["score"])))
+
+    return {
+        "userId": payload.userId,
+        "score": score_val,
+        "explanation": parsed["explanation"]
+    }