Update app.py

app.py

@@ -17,14 +17,15 @@ 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
+# MongoDB setup
 mongo_client = MongoClient(MONGO_URI)
 default_db = mongo_client.get_default_database()
+
 if default_db is None:
     raise RuntimeError("Unable to determine default database from MONGO_URI")
 
@@ -38,11 +39,16 @@ openai = OpenAI(api_key=OPENAI_API_KEY)
 app = FastAPI(title="Financial Health Score Service")
 
 
+# ===========================
+# MODELS
+# ===========================
 class ScoreRequest(BaseModel):
     userId: str
 
 
-# ----------------------------- HELPERS ---------------------------------- #
+# ===========================
+# HELPERS
+# ===========================
 
 def safe_number(value):
     try:
@@ -54,8 +60,8 @@ def safe_number(value):
 def normalize_budgets(budgets):
     normalized = []
     for budget in budgets:
-        heads = budget.get("headCategories") or []
         head_categories = []
+        heads = budget.get("headCategories") or []
 
         if isinstance(heads, list):
             for head in heads:
@@ -78,6 +84,7 @@ def normalize_budgets(budgets):
             "notifications": budget.get("notifications") or [],
             "headCategories": head_categories,
         })
+
     return normalized
 
 
@@ -96,7 +103,6 @@ def normalize_transactions(transactions):
             "amount": safe_number(txn.get("amount")),
             "date": date_str,
         })
-
     return trimmed
 
 
@@ -119,55 +125,54 @@ Respond ONLY with:
 def extract_json_payload(text):
     """Extract JSON from plain text or fenced code blocks."""
     trimmed = (text or "").strip()
-    match = re.search(r"```(?:json)?\s*([\s\S]*?)```", trimmed)
 
-    payload = match.group(1).strip() if match else trimmed
-    return json.loads(payload)
+    fenced = re.search(r"```(?:json)?\s*([\s\S]*?)```", trimmed)
+    if fenced:
+        return json.loads(fenced.group(1).strip())
+
+    return json.loads(trimmed)
 
 
+# ===========================
+# NEW BULLETPROOF OPENAI EXTRACTOR
+# ===========================
+
 def extract_openai_text(response):
     """
-    Safely extracts text from ANY OpenAI Chat Completion output.
+    Bulletproof extractor for OpenAI SDK v1.x ChatCompletion responses.
     Handles:
-      - string output
-      - list of blocks
-      - dict with 'content'
-      - dict with 'text'
+      - message.content (real JSON string)
+      - ChatCompletionMessage(content='...') object repr (your case)
+      - strings
+      - lists
     """
     try:
-        message = response.choices[0].message
+        msg = response.choices[0].message
     except Exception:
         raise HTTPException(status_code=502, detail="OpenAI returned no valid choices")
 
-    # Case: dict with content
-    if isinstance(message, dict) and "content" in message:
-        content = message["content"]
-    else:
-        content = message
-
-    # Simple string
-    if isinstance(content, str):
-        return content.strip()
+    # Case 1: content exists normally
+    if hasattr(msg, "content"):
+        return msg.content.strip()
 
-    # List of blocks
-    if isinstance(content, list):
-        output_chunks = []
-        for block in content:
-            if isinstance(block, dict) and "text" in block:
-                output_chunks.append(block["text"])
-            elif isinstance(block, str):
-                output_chunks.append(block)
-        return "\n".join(output_chunks).strip()
+    # Case 2: msg is dict containing 'content'
+    if isinstance(msg, dict) and "content" in msg:
+        return str(msg["content"]).strip()
 
-    # Dict with text
-    if isinstance(content, dict) and "text" in content:
-        return content["text"].strip()
+    # Case 3: msg is a Python repr:
+    # ChatCompletionMessage(content='{"score":...}', role='assistant')
+    msg_str = str(msg)
+    match = re.search(r"content='([\s\S]*?)'", msg_str)
+    if match:
+        return match.group(1).strip()
 
-    # Fallback: stringify
-    return str(content).strip()
+    # Fallback
+    return msg_str.strip()
 
 
-# ----------------------------- ROUTES ---------------------------------- #
+# ===========================
+# ROUTES
+# ===========================
 
 @app.get("/")
 def root():
@@ -194,7 +199,6 @@ def financial_score(payload: ScoreRequest):
         }).sort("date", -1).limit(100)
     )
 
-    # If no data
     if not budgets and not transactions:
         return {
             "userId": payload.userId,
@@ -202,10 +206,9 @@ def financial_score(payload: ScoreRequest):
             "explanation": "No budgets or transactions found."
         }
 
-    # Build LLM prompt
     prompt = score_prompt(budgets, transactions)
 
-    # Call OpenAI (new SDK format)
+    # Call OpenAI
     try:
         response = openai.chat.completions.create(
             model="gpt-4o-mini",
@@ -224,19 +227,26 @@ def financial_score(payload: ScoreRequest):
     except Exception:
         raise HTTPException(
             status_code=502,
-            detail={"error": "Unable to parse OpenAI response", "rawResponse": model_output}
+            detail={
+                "error": "Unable to parse OpenAI response",
+                "rawResponse": model_output
+            },
         )
 
-    # Validate format
+    # Validate required fields
     if "score" not in parsed or "explanation" not in parsed:
         raise HTTPException(
             status_code=502,
-            detail={"error": "OpenAI response missing required fields", "rawResponse": model_output}
+            detail={
+                "error": "OpenAI response missing required fields",
+                "rawResponse": model_output
+            }
         )
 
-    # Clamp score to 0–100
+    # Score limits
     try:
-        score_val = max(0, min(100, int(float(parsed["score"]))))
+        score_val = int(float(parsed["score"]))
+        score_val = max(0, min(100, score_val))
     except Exception:
         score_val = 0
 
@@ -244,4 +254,4 @@ def financial_score(payload: ScoreRequest):
         "userId": payload.userId,
         "score": score_val,
         "explanation": parsed["explanation"]
-    }
+    }