Update app.py

app.py

@@ -1,9 +1,6 @@
 # ================================
 # 🪞 MoodMirror+ — Conversational Emotional Self-Care
-# Dataset-only: TF-IDF + OneVsRest Logistic Regression on GoEmotions
-# - Persists model & SQLite DB to /data (HF Spaces persistent storage)
-# - Always gives an advice tip (plus sometimes a quote)
-# - Detects implicit emotion cues (emoji/slang/negation)
+# Dataset-only (GoEmotions) + always gives a self-care advice (no quotes)
 # ================================
 import os
 import re
@@ -31,132 +28,96 @@ DATA_DIR = os.getenv("MM_DATA_DIR", _pick_data_dir())
 os.makedirs(DATA_DIR, exist_ok=True)
 DB_PATH = os.path.join(DATA_DIR, "moodmirror.db")
 MODEL_PATH = os.path.join(DATA_DIR, "goemo_sklearn.joblib")
-MODEL_VERSION = "v3-always-tip"
+MODEL_VERSION = "v4-advice-only"
 
-print(f"[MM] Data dir: {DATA_DIR}")
-print(f"[MM] DB path:  {DB_PATH}")
-print(f"[MM] Model:    {MODEL_PATH}")
-
-# ---------------- Regex & Crisis ----------------
+# ---------------- Crisis detection ----------------
 CRISIS_RE = re.compile(
     r"\b(self[- ]?harm|suicid|kill myself|end my life|overdose|cutting|i don.?t want to live|can.?t go on)\b",
     re.I,
 )
 CLOSING_RE = re.compile(
-    r"\b(thanks?|thank you|that'?s all|bye|goodbye|see you|take care|ok bye|no thanks?)\b",
+    r"\b(thanks?|thank you|bye|goodbye|see you|take care|ok bye|no thanks?)\b",
     re.I,
 )
 
 CRISIS_NUMBERS = {
-    "United States": "Call or text **988** (24/7 Suicide & Crisis Lifeline). If in immediate danger, call **911**.",
-    "Canada": "Call or text **988** (Suicide Crisis Helpline, 24/7). If in immediate danger, call **911**.",
-    "United Kingdom / ROI": "Call **116 123** (Samaritans, 24/7). If in immediate danger, call **999 / 112**.",
-    "France": "Call **3114** (Numéro national de prévention du suicide, 24/7). If in immediate danger, call **112 / 15**.",
-    "Australia": "Call **13 11 14** (Lifeline, 24/7). If in immediate danger, call **000**.",
-    "Other / Not listed": "Call your local emergency number (**112/911**) or search “suicide crisis hotline” + your country.",
+    "United States": "Call or text **988** (Suicide & Crisis Lifeline, 24/7).",
+    "France": "Call **3114** (Numéro national de prévention du suicide, 24/7).",
+    "United Kingdom / ROI": "Call **116 123** (Samaritans, 24/7).",
+    "Canada": "Call or text **988** (Suicide Crisis Helpline).",
+    "Australia": "Call **13 11 14** (Lifeline).",
+    "Other / Not listed": "Call your local emergency number (**112/911**) or search 'suicide hotline' in your country.",
 }
 
-# ---------------- Advice & Quotes ----------------
+# ---------------- Advice library ----------------
 SUGGESTIONS = {
     "sadness": [
-        "Be gentle with yourself. Cry if you need to — that’s healing, not weakness.",
-        "Let yourself rest. You don’t have to be productive while your heart is heavy.",
-        "Hold a pillow or blanket close and breathe slowly.",
-        "It’s okay if today you just get through the day.",
-        "Talk to someone who feels safe, or write down what you wish someone would say to you.",
-        "Even quiet tears are a form of strength — you’re still here.",
-        "Take a warm shower, drink water, and do one small thing that feels kind.",
+        "Be gentle with yourself. Rest, cry, or connect — it’s okay to feel low.",
+        "Let yourself breathe; you don’t have to fix everything today.",
+        "Try writing down what hurts and what you wish someone could say to you.",
+        "Drink water, open a window, or take a short walk — small acts help.",
+        "Remember, sadness passes more easily when you let it exist.",
     ],
     "fear": [
-        "Ground yourself with slow breathing — feel your feet on the floor.",
-        "You are safe in this moment. Focus on what is real right now.",
-        "Remind yourself: not every thought is a fact.",
-        "Courage isn’t the absence of fear, it’s choosing to go on anyway.",
-        "Place a hand on your chest and whisper, ‘I am safe. I am present.’",
-        "Try saying: ‘I can handle this one moment at a time.’",
+        "Ground yourself — name 5 things you see, 4 you feel, 3 you hear.",
+        "You are safe in this moment; focus on your breath.",
+        "Not every thought is a fact — notice which ones just want attention.",
+        "Take slow breaths; safety starts with one calm inhale.",
     ],
     "joy": [
-        "Savor this — your body deserves to feel good.",
-        "Share your happiness with someone — even a smile counts.",
-        "Write down what’s bringing you joy today. It strengthens the memory.",
-        "Joy can be quiet — a cup of tea, a laugh, a calm pause.",
-        "Let the joy sink in; you don’t have to rush to the next thing.",
+        "Let yourself smile and enjoy it fully.",
+        "Pause and notice how joy feels in your body.",
+        "Share a kind word or message — happiness grows when shared.",
+        "Write down one thing that made you smile today.",
     ],
     "anger": [
-        "Pause and breathe — you don’t have to react right away.",
-        "Anger can mean something important needs attention — listen kindly.",
-        "Take a walk or shake out the tension before speaking.",
-        "It’s okay to be angry — what matters is what you do with it.",
-        "Ask yourself: ‘What boundary of mine needs care right now?’",
+        "Pause before reacting; give yourself time to cool down.",
+        "Take deep breaths — in through the nose, out slowly through the mouth.",
+        "Try walking or stretching to release the tension.",
+        "Ask yourself what boundary was crossed and how you can protect it calmly.",
     ],
     "boredom": [
-        "Try something small and new: a song, a stretch, a random fact.",
-        "Boredom can be a doorway — something in you wants to wake up.",
-        "Write a list of tiny adventures you could do today.",
-        "Look outside and notice one color or sound you hadn’t before.",
+        "Try something small and new — even a 2-minute change matters.",
+        "Move a little: tidy your space or step outside for fresh air.",
+        "Write down one creative idea, no matter how silly it feels.",
+        "Sometimes rest looks like boredom — let it recharge you.",
     ],
     "grief": [
-        "Grief is love that has nowhere to go — let it speak softly through you.",
-        "You’re allowed to miss them and still keep living.",
-        "Eat something, drink water — caring for your body honors their memory too.",
-        "Healing doesn’t mean forgetting; it means remembering with more peace.",
+        "Let the memories come — it’s okay to cry or miss someone deeply.",
+        "Hold an object that reminds you of love, not loss.",
+        "Eat, drink water, and rest — your body also grieves.",
+        "You don’t have to move on; you can move forward while remembering.",
     ],
     "love": [
-        "Tell someone you care about them — even in a small text.",
-        "Give love back to yourself: you deserve your own gentleness.",
-        "Love is quiet presence — you don’t have to prove it.",
-        "Let yourself receive love — it’s not selfish to need warmth.",
+        "Reach out to someone you care about — a few words can mean a lot.",
+        "Take a deep breath and remind yourself that you are loved too.",
+        "Do one small act of kindness for yourself or another.",
+        "Love doesn’t have to be loud; quiet care counts too.",
     ],
     "nervousness": [
-        "Breathe slower than your worry — your body will follow your rhythm.",
-        "Relax your jaw, drop your shoulders, exhale longer than you inhale.",
-        "You don’t have to fix every thought; let them pass like clouds.",
-        "Try naming five things you can see right now.",
+        "Relax your shoulders, unclench your jaw, and breathe slowly.",
+        "Write your worries down, then cross out what you can’t control.",
+        "Try the 4-7-8 breath: inhale 4, hold 7, exhale 8.",
+        "Tell yourself: 'I can handle this one moment at a time.'",
     ],
     "curiosity": [
-        "Follow the spark — it doesn’t have to make sense yet.",
-        "Ask the question that feels exciting, not the one that feels safe.",
-        "Learning is self-care too — wonder is nourishment.",
-        "Even small discoveries can wake up your energy.",
+        "Follow what interests you, even if it seems random.",
+        "Ask one new question today — curiosity keeps your mind alive.",
+        "Try learning something small with no pressure to master it.",
+        "Explore a thought just because it feels interesting.",
     ],
     "gratitude": [
-        "Name three things you’re grateful for — big or tiny.",
-        "Look around and notice something that quietly supports you.",
-        "Each breath is a gift you didn’t have to earn.",
-        "Gratitude softens fear; it reminds you what’s still good.",
+        "Name three things you’re grateful for right now.",
+        "Say thank you — even silently — for something that helped you.",
+        "Take a photo or note of something simple that brings comfort.",
+        "Remember that small joys count just as much as big ones.",
     ],
     "neutral": [
-        "Take one slow, deep breath. That’s a start.",
-        "Not every moment has to be meaningful — existing is enough.",
-        "Sometimes calm feels empty because we’re used to noise — rest in it.",
-        "Drink water; your brain loves that.",
-    ],
-}
-
-QUOTES = {
-    "sadness": [
-        "“Even the darkest night will end and the sun will rise.” – Victor Hugo",
-        "“You have survived every hard day so far.”",
-    ],
-    "fear": [
-        "“Feel the fear and do it anyway.” – Susan Jeffers",
-        "“This moment will not last forever.”",
-    ],
-    "joy": [
-        "“Happiness is not out there, it’s in you.”",
-        "“Enjoy the little things — one day you’ll realize they were the big things.”",
-    ],
-    "anger": [
-        "“Peace begins with a pause.”",
-        "“Anger is energy — guide it, don’t suppress it.”",
+        "Take a slow, conscious breath and relax your body.",
+        "Notice one pleasant detail around you — sound, color, or scent.",
+        "Sit quietly for a minute; calm moments build strength.",
+        "Stretch or move — it helps your mood reset naturally.",
     ],
-    "boredom": ["“Curiosity is the cure for boredom.” – Dorothy Parker"],
-    "grief": ["“Grief is love that has nowhere to go.”"],
-    "love": ["“Where there is love, there is life.” – Mahatma Gandhi"],
-    "nervousness": ["“Breathe. You are doing enough.”"],
-    "curiosity": ["“Stay curious — it’s the mind’s way of loving life.”"],
-    "gratitude": ["“Gratitude turns what we have into enough.”"],
-    "neutral": ["“Be present — even a calm moment can be a quiet victory.”"],
 }
 
 COLOR_MAP = {
@@ -178,36 +139,30 @@ GOEMO_TO_APP = {
     "sadness": "sadness", "surprise": "neutral", "neutral": "neutral",
 }
 
-# --- Emotion detection parameters ---
-THRESHOLD = 0.30
+# ---------------- Model configuration ----------------
+THRESHOLD = 0.3
 MIN_THRESHOLD = 0.12
 TOP1_FALLBACK = True
 
-# --- Implicit cues ---
+# ---------------- Helper: augment text ----------------
 EMOJI_HINTS = {"😢": "sadness", "😭": "sadness", "😡": "anger", "😍": "love", "🤔": "curiosity"}
-SLANG_HINTS = {"idk": "confusion", "meh": "boredom", "ugh": "annoyance", "im fine": "sadness", "i'm fine": "sadness"}
-NEGATION_PATTERNS = [("not happy", "sadness"), ("not ok", "sadness"), ("not calm", "nervousness"), ("no motivation","boredom")]
-INTENSIFIERS = ["!!", "!!!", "really", "so", "very"]
+SLANG_HINTS = {"idk": "confusion", "meh": "boredom", "ugh": "annoyance", "im fine": "sadness"}
+NEGATION_PATTERNS = [("not happy", "sadness"), ("not ok", "sadness"), ("no motivation", "boredom")]
 
-def augment_text_for_classifier(text: str) -> str:
+def augment_text(text):
     t = text.lower()
     hints = []
     for ch in text:
-        if ch in EMOJI_HINTS:
-            hints.append(EMOJI_HINTS[ch])
+        if ch in EMOJI_HINTS: hints.append(EMOJI_HINTS[ch])
     for k, v in SLANG_HINTS.items():
-        if k in t:
-            hints.append(v)
+        if k in t: hints.append(v)
     for pat, lab in NEGATION_PATTERNS:
-        if pat in t:
-            hints.append(lab)
-    if hints and any(x in t for x in INTENSIFIERS):
-        hints += hints
+        if pat in t: hints.append(lab)
     if hints:
         return text + " " + " ".join([f"emo_{h}" for h in hints])
     return text
 
-# ---------------- DB helpers ----------------
+# ---------------- DB setup ----------------
 def get_conn():
     return sqlite3.connect(DB_PATH, check_same_thread=False, timeout=10)
 
@@ -217,19 +172,21 @@ def init_db():
     c.execute("""CREATE TABLE IF NOT EXISTS sessions(
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         ts TEXT, country TEXT, user_text TEXT, main_emotion TEXT)""")
-    conn.commit(); conn.close()
+    conn.commit()
+    conn.close()
 
 def log_session(country, msg, emotion):
-    conn = get_conn(); c = conn.cursor()
+    conn = get_conn()
+    c = conn.cursor()
     c.execute("INSERT INTO sessions(ts,country,user_text,main_emotion)VALUES(?,?,?,?)",
               (datetime.utcnow().isoformat(timespec="seconds"), country, msg[:500], emotion))
-    conn.commit(); conn.close()
+    conn.commit()
+    conn.close()
 
-# ---------------- Train / Load ----------------
+# ---------------- Model training/loading ----------------
 def load_goemotions_dataset():
     ds = load_dataset("google-research-datasets/go_emotions", "simplified")
-    label_names = ds["train"].features["labels"].feature.names
-    return ds, label_names
+    return ds, ds["train"].features["labels"].feature.names
 
 def train_or_load_model():
     if os.path.isfile(MODEL_PATH):
@@ -238,69 +195,48 @@ def train_or_load_model():
             return bundle["pipeline"], bundle["mlb"], bundle["label_names"]
     ds, names = load_goemotions_dataset()
     X_train, y_train = ds["train"]["text"], ds["train"]["labels"]
-    X_val, y_val = ds["validation"]["text"], ds["validation"]["labels"]
     mlb = MultiLabelBinarizer(classes=list(range(len(names))))
-    Y_train, Y_val = mlb.fit_transform(y_train), mlb.transform(y_val)
+    Y_train = mlb.fit_transform(y_train)
     clf = Pipeline([
-        ("tfidf", TfidfVectorizer(lowercase=True, ngram_range=(1,2), min_df=2, max_df=0.9, strip_accents="unicode")),
+        ("tfidf", TfidfVectorizer(lowercase=True, ngram_range=(1,2), min_df=2, max_df=0.9)),
         ("ovr", OneVsRestClassifier(
-            LogisticRegression(solver="saga", max_iter=1000, class_weight="balanced"),
-            n_jobs=-1))
+            LogisticRegression(solver="saga", max_iter=1000, class_weight="balanced"), n_jobs=-1))
     ])
     clf.fit(X_train, Y_train)
-    print(f"[MM] Val macro F1: {f1_score(Y_val, clf.predict(X_val), average='macro', zero_division=0):.3f}")
     joblib.dump({"version": MODEL_VERSION, "pipeline": clf, "mlb": mlb, "label_names": names}, MODEL_PATH)
     return clf, mlb, names
 
 try:
     CLASSIFIER, MLB, LABEL_NAMES = train_or_load_model()
 except Exception as e:
-    print(f"[WARN] Model load error: {e}")
+    print("[WARN] Model not loaded:", e)
     CLASSIFIER, MLB, LABEL_NAMES = None, None, None
 
-# ---------------- Emotion inference ----------------
-def classify_text(text: str):
-    if not CLASSIFIER or not LABEL_NAMES: return []
-    augmented = augment_text_for_classifier(text)
-    try:
-        proba = CLASSIFIER.predict_proba([augmented])[0]
-    except AttributeError:
-        from scipy.special import expit
-        proba = expit(CLASSIFIER.decision_function([augmented])[0])
-    maxp = float(max(proba)) if len(proba) else 0.0
+# ---------------- Emotion detection ----------------
+def classify_text(text):
+    if not CLASSIFIER: return []
+    t = augment_text(text)
+    proba = CLASSIFIER.predict_proba([t])[0]
+    maxp = max(proba)
     thr = THRESHOLD if maxp >= THRESHOLD else max(MIN_THRESHOLD, maxp * 0.8)
-    idxs = [i for i, p in enumerate(proba) if p >= thr]
-    if not idxs and TOP1_FALLBACK and len(proba):
-        idxs = [int(max(range(len(proba)), key=lambda i: proba[i]))]
+    idxs = [i for i, p in enumerate(proba) if p >= thr] or [int(proba.argmax())]
     idxs.sort(key=lambda i: proba[i], reverse=True)
     return [(LABEL_NAMES[i], float(proba[i])) for i in idxs]
 
-def detect_emotions(text: str):
+def detect_emotions(text):
     chosen = classify_text(text)
     if not chosen: return "neutral"
     bucket = {}
-    for label, p in chosen:
-        app = GOEMO_TO_APP.get(label.lower(), "neutral")
-        bucket[app] = max(bucket.get(app, 0.0), p)
+    for lbl, p in chosen:
+        app = GOEMO_TO_APP.get(lbl.lower(), "neutral")
+        bucket[app] = max(bucket.get(app, 0), p)
     return max(bucket, key=bucket.get) if bucket else "neutral"
 
-# ---------------- Reply composer ----------------
-def compose_support(main_emotion: str, is_first_msg: bool) -> str:
-    tip = random.choice(SUGGESTIONS.get(main_emotion, SUGGESTIONS["neutral"]))
-    quote = random.choice(QUOTES.get(main_emotion, ["“This too shall pass.”"]))
-    reply = f"• {tip}"                       # ALWAYS a tip
-    if random.random() < 0.5:
-        reply += f"\n\n💬 {quote}"
-    if is_first_msg:
-        reply += "\n\n*Can you tell me a bit more about what’s behind that feeling?*"
-    return reply
-
 # ---------------- Chat logic ----------------
 def crisis_block(country):
     msg = CRISIS_NUMBERS.get(country, CRISIS_NUMBERS["Other / Not listed"])
-    return ("💛 I'm really sorry you're feeling like this. You matter.\n\n"
-            f"**If you might be in danger or thinking about harming yourself:**\n{msg}\n\n"
-            "Please reach out to someone now. You are not alone.")
+    return (f"💛 I'm really sorry you're feeling like this. You matter.\n\n"
+            f"{msg}\n\nPlease reach out for help — you are not alone.")
 
 def chat_step(message, history, country, save_session):
     if CRISIS_RE.search(message):
@@ -308,74 +244,41 @@ def chat_step(message, history, country, save_session):
     if CLOSING_RE.search(message):
         emotion = detect_emotions(message)
         tip = random.choice(SUGGESTIONS.get(emotion, SUGGESTIONS["neutral"]))
-        return (f"Thank you 💛 One last gentle thought:\n\n• {tip}", "#FFFFFF")
-
-    recent = " ".join(message.split()[-100:])
-    emotion = detect_emotions(recent)
+        return (f"Thank you 💛 One last gentle reminder:\n\n• {tip}", "#FFFFFF")
+    emotion = detect_emotions(message)
     color = COLOR_MAP.get(emotion, "#FFFFFF")
     if save_session:
         log_session(country, message, emotion)
-    reply = compose_support(emotion, is_first_msg=not bool(history))
+    tip = random.choice(SUGGESTIONS.get(emotion, SUGGESTIONS["neutral"]))
+    reply = f"• {tip}"
+    if not history:
+        reply += "\n\n*Can you tell me a bit more about that feeling?*"
     return reply, color
 
-# ---------------- Gradio UI ----------------
+# ---------------- Interface ----------------
 init_db()
 
-custom_css = """
-:root, body, .gradio-container { transition: background-color 0.8s ease !important; }
-.typing { font-style: italic; opacity: 0.8; animation: blink 1s infinite; }
-@keyframes blink { 50% {opacity: 0.4;} }
-"""
-
-with gr.Blocks(css=custom_css, title="🪞 MoodMirror+ (Dataset-only Edition)") as demo:
-    style_injector = gr.HTML("")
-    gr.Markdown(
-        "### 🪞 MoodMirror+ — Emotional Support & Inspiration 🌸\n"
-        "Powered only by the **GoEmotions dataset** (trained locally on startup).\n\n"
-        "_Not medical advice. If you feel unsafe, please reach out for help immediately._"
-    )
-
+with gr.Blocks(title="🪞 MoodMirror+ (Advice-only)") as demo:
+    style = gr.HTML("")
+    gr.Markdown("### 🪞 MoodMirror+ — Gentle Emotional Support 🌿\n"
+                "Always responds with a caring self-care tip.\n\n"
+                "_Not medical advice. If you feel unsafe, please reach out for help immediately._")
     with gr.Row():
-        country = gr.Dropdown(choices=list(CRISIS_NUMBERS.keys()),
-                              value="Other / Not listed", label="Country")
-        save_ok = gr.Checkbox(value=False, label="Save anonymized session (no personal data)")
-
+        country = gr.Dropdown(list(CRISIS_NUMBERS.keys()), value="Other / Not listed", label="Country")
+        save_ok = gr.Checkbox(False, label="Save anonymized session (no personal data)")
     chat = gr.Chatbot(height=360)
-    msg = gr.Textbox(placeholder="Type how you feel...", label="Your message")
+    msg = gr.Textbox(label="Your message", placeholder="Tell me how you feel...")
     send = gr.Button("Send")
-    typing = gr.Markdown("", elem_classes="typing")
-
-    # Optional: dataset preview
-    with gr.Accordion("🔎 Preview GoEmotions samples", open=False):
-        with gr.Row():
-            n_examples = gr.Slider(1, 10, value=5, step=1, label="Number of examples")
-            split = gr.Dropdown(["train", "validation", "test"], value="train", label="Split")
-            refresh = gr.Button("Show samples")
-        table = gr.Dataframe(headers=["text", "labels"], row_count=5, wrap=True)
-
-        def refresh_samples(n, split_name):
-            try:
-                ds = load_dataset("google-research-datasets/go_emotions", "simplified")
-                names = ds["train"].features["labels"].feature.names
-                rows = ds[split_name].shuffle(seed=42).select(range(min(int(n), len(ds[split_name]))))
-                return [[t, ", ".join([names[i] for i in labs])] for t, labs in zip(rows["text"], rows["labels"])]
-            except Exception as e:
-                return [[f"Dataset load error: {e}", ""]]
-
-        refresh.click(refresh_samples, inputs=[n_examples, split], outputs=[table])
 
     def respond(user_msg, chat_hist, country_choice, save_flag):
-        if not user_msg or not user_msg.strip():
-            # outputs: [chat, typing, style_injector, msg]
+        if not user_msg.strip():
             return chat_hist + [[user_msg, "Please share a short sentence about how you feel 🙂"]], "", "", ""
         reply, color = chat_step(user_msg, chat_hist, country_choice, bool(save_flag))
         style_tag = f"<style>:root,body,.gradio-container{{background:{color}!important;}}</style>"
         return chat_hist + [[user_msg, reply]], "", style_tag, ""
 
-    send.click(respond, inputs=[msg, chat, country, save_ok],
-               outputs=[chat, typing, style_injector, msg], queue=True)
-    msg.submit(respond, inputs=[msg, chat, country, save_ok],
-               outputs=[chat, typing, style_injector, msg], queue=True)
+    send.click(respond, [msg, chat, country, save_ok], [chat, style, style, msg], queue=True)
+    msg.submit(respond, [msg, chat, country, save_ok], [chat, style, style, msg], queue=True)
 
 if __name__ == "__main__":
     demo.queue()