Update app.py

app.py

@@ -1,7 +1,6 @@
 import os
 import json
 import requests
-import time
 from datetime import datetime
 from flask import Flask, request, jsonify, send_from_directory
 from transformers import pipeline
@@ -9,17 +8,14 @@ from openai import OpenAI
 
 app = Flask(__name__)
 
-# Load emotion model once
+# Load emotion model
 emotion_model = pipeline(
     "text-classification",
     model="j-hartmann/emotion-english-distilroberta-base"
 )
 
-# Persistent user data
+# Ensure user data file
 USER_FILE = "user_data.json"
-STATE_FILE = "model_state.json"
-
-# Initialize files
 if not os.path.exists(USER_FILE):
     with open(USER_FILE, "w") as f:
         json.dump({
@@ -32,10 +28,6 @@ if not os.path.exists(USER_FILE):
             "conversation_history": []
         }, f)
 
-if not os.path.exists(STATE_FILE):
-    with open(STATE_FILE, "w") as f:
-        json.dump({"current_model": "gpt-4o-mini", "last_switch": None}, f)
-
 def load_user():
     with open(USER_FILE, "r") as f:
         return json.load(f)
@@ -44,21 +36,17 @@ def save_user(data):
     with open(USER_FILE, "w") as f:
         json.dump(data, f)
 
-def load_state():
-    with open(STATE_FILE, "r") as f:
-        return json.load(f)
-
-def save_state(state):
-    with open(STATE_FILE, "w") as f:
-        json.dump(state, f)
-
+# Safe OpenAI client initialization
 def get_client():
     api_key = os.getenv("OPENAI_API_KEY")
     if not api_key or api_key.strip() == "":
-        raise ValueError("OpenAI API key missing or empty. Please set it in secrets.")
+        raise ValueError("OpenAI API key is missing or empty. Please set OPENAI_API_KEY in Hugging Face Secrets.")
     return OpenAI(api_key=api_key)
 
-# Suicide helplines by country
+# Model priority list for fallbacks
+MODEL_LIST = ["gpt-4o-mini", "gpt-3.5-turbo", "gpt-3.5-turbo-16k"]
+
+# Helpline numbers
 HELPLINES = {
     "US": "National Suicide Prevention Lifeline: 988",
     "UK": "Samaritans: 116 123",
@@ -72,7 +60,7 @@ def get_country_from_ip(ip):
     try:
         response = requests.get(f"http://ipapi.co/{ip}/country/")
         if response.status_code == 200:
-            return response.text.strip().upper()
+            return response.text.upper()
     except:
         pass
     return "default"
@@ -88,23 +76,20 @@ def chat():
         message = data.get("message", "").strip()
         if not message:
             return jsonify({"reply": "Please enter a message.", "emotion": "neutral"}), 400
-
         mode = data.get("mode", "emotional_support")
         user_ip = request.remote_addr
 
         user = load_user()
-        state = load_state()
         now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-
         user["last_interaction"] = now
         user["mode"] = mode
         user["conversation_history"].append({"role": "user", "content": message, "timestamp": now})
 
-        # Emotion analysis
+        # Emotion detection
         emotion = emotion_model(message)[0]["label"]
         user["mood"] = emotion
 
-        # Self-harm detection
+        # Self-harm check
         if detect_self_harm(message):
             country = get_country_from_ip(user_ip)
             helpline = HELPLINES.get(country, HELPLINES["default"])
@@ -116,72 +101,58 @@ def chat():
             save_user(user)
             return jsonify({"reply": reply, "emotion": emotion})
 
-        # Build system + context
+        # Build context for chat
         history = user["conversation_history"][-10:]
         messages = [
             {"role": "system", "content": (
                 f"You are Serenity — an empathetic, emotionally intelligent best friend. "
-                f"Be warm, supportive, and natural. Respond briefly (1–2 sentences) with kindness, curiosity, "
-                f"and a human-like tone. No repetition. Mode: {mode}. User mood: {emotion}."
+                f"Be warm, caring, supportive, and human-like. Respond briefly (1–2 sentences), "
+                f"showing love, empathy, and curiosity. Never sound robotic or repetitive. "
+                f"Current mood: {emotion}. Mode: {mode}."
             )}
         ] + history
 
+        # Try models in priority order
         client = get_client()
-        model_order = ["gpt-4o-mini", "gpt-3.5-turbo"]
-
-        # Start with remembered model
-        active_model = state.get("current_model", "gpt-4o-mini")
-        model_order.remove(active_model)
-        model_order.insert(0, active_model)
-
-        for model_name in model_order:
+        reply = None
+        for model in MODEL_LIST:
             try:
-                print(f"💬 Using model: {model_name}")
                 response = client.chat.completions.create(
-                    model=model_name,
+                    model=model,
                     messages=messages,
                     temperature=0.8
                 )
-
                 reply = response.choices[0].message.content.strip()
-                user["conversation_history"].append({"role": "assistant", "content": reply, "timestamp": now})
-                save_user(user)
-
-                # Update remembered model
-                state["current_model"] = model_name
-                state["last_switch"] = now
-                save_state(state)
-
-                return jsonify({"reply": reply, "emotion": emotion})
-
+                print(f"✅ Used model: {model}")
+                break  # Success, stop trying other models
             except Exception as e:
-                err_text = str(e).lower()
-                print(f"⚠️ Error with {model_name}: {err_text}")
-
-                # If rate limited — switch and retry
-                if "rate limit" in err_text or "429" in err_text:
-                    state["current_model"] = "gpt-3.5-turbo"
-                    state["last_switch"] = now
-                    save_state(state)
-                    print("⏳ Rate limit hit, switching model temporarily...")
-                    time.sleep(1)
-                    continue
+                error_str = str(e).lower()
+                if "rate_limit" in error_str or "429" in error_str or "quota" in error_str:
+                    print(f"⚠️ Rate limit on {model}, trying next model...")
+                    continue  # Try next model
                 else:
-                    raise
+                    # Non-rate-limit error, re-raise
+                    raise e
 
-        # Both failed
-        return jsonify({
-            "reply": "I'm taking a small pause — looks like the system is busy. Try again in a few minutes ❤️",
-            "emotion": "neutral"
-        }), 429
+        if reply is None:
+            # All models failed
+            reply = "All models are currently rate-limited. Please try again later or check your OpenAI account."
+
+        user["conversation_history"].append({"role": "assistant", "content": reply, "timestamp": now})
+        save_user(user)
+
+        return jsonify({"reply": reply, "emotion": emotion})
 
     except ValueError as e:
         print(f"❌ API Key Error: {e}")
-        return jsonify({"reply": "API key missing or invalid. Please check settings.", "emotion": "neutral"}), 500
+        return jsonify({
+            "reply": "API key is missing or invalid. Please check your Hugging Face Secrets and ensure it's a valid OpenAI key.",
+            "emotion": "neutral"
+        }), 500
     except Exception as e:
         print(f"❌ Chat error: {e}")
         return jsonify({
-            "reply": "Something went wrong (network or system issue). Try again shortly ❤️",
+            "reply": "Something went wrong (e.g., network issue). Try again later.",
             "emotion": "neutral"
         }), 500