Update app.py

app.py

@@ -1,7 +1,6 @@
 # ================================
-# 🪞 MoodMirror+ — Text Emotion • Advice-only + Emergency Numbers tab
-# - Text: GoEmotions (TF-IDF + OneVsRest LR, dataset-only)
-# - Adds a "Numéros d'urgence" tab for crisis helplines by country
+# 🪞 MoodMirror+ — Text Emotion • Advice-only + brief intros & reasons
+# - Adds an English "Emergency numbers" tab by country
 # ================================
 import os
 import re
@@ -41,6 +40,7 @@ CLOSING_RE = re.compile(
     re.I,
 )
 
+# (Original mapping kept for in-chat crisis block)
 CRISIS_NUMBERS = {
     "France": "📞 **3114** (Numéro national de prévention du suicide, 24/7)",
     "United States": "📞 **988** (Suicide & Crisis Lifeline, 24/7)",
@@ -50,33 +50,202 @@ CRISIS_NUMBERS = {
     "Other / Not listed": "Call local emergency (**112/911**) or search “suicide hotline” for your country.",
 }
 
-# ---------------- Advice library ----------------
+# --------- English mapping used by the new tab (expanded) ----------
+CRISIS_NUMBERS_EN = {
+    # Core set you already had
+    "United States": "📞 **988** (Suicide & Crisis Lifeline, 24/7)",
+    "Canada": "📞 **988** (Suicide Crisis Helpline, 24/7)",
+    "United Kingdom": "📞 **116 123** (Samaritans, 24/7)",
+    "Ireland": "📞 **116 123** (Samaritans Ireland, 24/7)",
+    "France": "📞 **3114** (National Suicide Prevention number, 24/7)",
+    "Australia": "📞 **13 11 14** (Lifeline, 24/7)",
+
+    # Added countries (verified public resources)
+    "Belgium": "📞 **1813** (Zelfmoordlijn, 24/7)",
+    "Switzerland": "📞 **143** (La Main Tendue / Heart2Heart)",
+    "Spain": "📞 **024** (Línea 024 — Atención a la conducta suicida, 24/7)",
+    "Germany": "📞 **0800 111 0 111** / **0800 111 0 222** / **116 123** (TelefonSeelsorge, 24/7)",
+    "Netherlands": "📞 **0800-0113** (free) or **113** (standard rate) — 113 Suicide Prevention",
+    "Portugal": "📞 **213 544 545**, **912 802 669**, **963 524 660** (SOS Voz Amiga)",
+    "New Zealand": "📞 **0508 828 865** (Suicide Crisis Helpline — TAUTOKO)",
+    "India": "📞 **14416** (Tele MANAS, 24/7) or **1800-599-0019** (KIRAN)",
+    "South Africa": "📞 **0800 567 567** (SADAG Suicide Crisis Helpline, 24/7)",
+
+    # Fallback
+    "Other / Not listed": "Call local emergency (**112/911**) or search “suicide hotline” + your country.",
+}
+
+# ---------------- Advice library (concise, actionable) ----------------
 SUGGESTIONS = {
-    "sadness": ["Go for a 5-minute outside walk and name three colors you see."],
-    "fear": ["Do 5-4-3-2-1 grounding: 5 see, 4 feel, 3 hear, 2 smell, 1 taste."],
-    "anger": ["Take space before replying; set a 10-minute timer."],
-    "nervousness": ["4-7-8 breathing: in 4s, hold 7s, out 8s (four rounds)."],
-    "boredom": ["Set a 2-minute timer and start anything small."],
-    "grief": ["Hold a photo or object and say their name softly."],
-    "love": ["Send a kind message without expecting a reply."],
-    "joy": ["Pause and take three slow breaths to savor this."],
-    "curiosity": ["Search one concept and read just the first paragraph."],
-    "gratitude": ["List three tiny things that made today easier."],
-    "neutral": ["Take one slow breath and relax your hands."],
+    "sadness": [
+        "Go for a 5-minute outside walk and name three colors you see.",
+        "Write what hurts, then add one thing you still care about.",
+        "Take a warm shower and focus on the feeling on your shoulders.",
+        "Message a safe person: “Can I vent for 2 minutes?”",
+        "Eat something simple and drink a big glass of water.",
+        "Play one song that matches your mood — don’t hide it.",
+        "Wrap yourself in a blanket and slow your exhale for 60 seconds.",
+        "List three small things that kept you going today.",
+        "Tidy one tiny area (corner of the desk or sink).",
+        "Watch something gentle or nostalgic for 10 minutes.",
+        "Place a hand on your chest and repeat: “This will pass.”",
+        "Write a note to your future self: “You made it through today.”",
+    ],
+    "fear": [
+        "Do 5-4-3-2-1 grounding: 5 see, 4 feel, 3 hear, 2 smell, 1 taste.",
+        "Make your exhale longer than your inhale for eight breaths.",
+        "Turn on a light or soft music to signal safety to your body.",
+        "Name the fear out loud in one sentence.",
+        "Hold something cold in your hand for 30 seconds.",
+        "Tell yourself: “Just the next minute — that’s all.”",
+        "Stand up and shake out your hands and arms.",
+        "Write the worst case, then the most likely case beside it.",
+        "Walk while counting your steps slowly to 100.",
+        "Mute news/scrolling for the next 30 minutes.",
+        "Sit with back supported and feet flat; feel the contact points.",
+        "Repeat softly: “This feeling is temporary.”",
+    ],
+    "anger": [
+        "Take space before replying; set a 10-minute timer.",
+        "Do ten slow exhales through pursed lips.",
+        "Write an uncensored note and delete it afterward.",
+        "Splash cool water on your face or wrists.",
+        "Walk fast for five minutes or climb one set of stairs.",
+        "Name the crossed boundary and craft one calm sentence.",
+        "Squeeze then release your fists ten times.",
+        "Clean a small area to discharge energy.",
+        "Postpone the decision until you feel steady again.",
+        "Say: “I’m not ready to talk yet; I’ll come back later.”",
+        "Ask yourself: “What hurt sits under this anger?”",
+        "Drop your shoulders and unclench your jaw.",
+    ],
+    "nervousness": [
+        "4-7-8 breathing: in 4s, hold 7s, out 8s (four rounds).",
+        "Relax your jaw and lower your shoulders.",
+        "Write worries down; cross out what you can’t control.",
+        "Pick one tiny action you can finish in five minutes.",
+        "Trace a square with your finger; breathe in on each side.",
+        "Walk while matching steps to slower breaths.",
+        "Sit by daylight or open a window for fresh air.",
+        "Say: “I can do this one step at a time.”",
+        "Pause caffeine for the next few hours.",
+        "Give yourself a 2-minute pause — eyes on one calm point.",
+        "Hold a warm mug and notice the heat.",
+        "Stretch your arms overhead and widen your posture.",
+    ],
+    "boredom": [
+        "Set a 2-minute timer and start anything small.",
+        "Change your soundtrack — put on one new song.",
+        "Shift a few objects on your desk for a new view.",
+        "Read one paragraph on a random topic.",
+        "Doodle or hum for 90 seconds without judging it.",
+        "Step outside; look up and find three shapes in the sky.",
+        "Write five ideas quickly without editing.",
+        "Do 15 jumping jacks or a quick stretch.",
+        "Clean your phone screen or keyboard.",
+        "Try a different drink or snack.",
+        "Learn one keyboard shortcut you’ll use today.",
+        "Send a simple “how are you?” to someone.",
+    ],
+    "grief": [
+        "Hold a photo or object and say their name softly.",
+        "Drink water and eat something — your body grieves too.",
+        "Write a short letter to them about today.",
+        "Rest without guilt — sorrow is heavy work.",
+        "Share one memory you want to keep vivid.",
+        "Let tears come when they need to.",
+        "Light a candle and sit quietly for two minutes.",
+        "Walk somewhere meaningful and notice what rises.",
+        "Create a small ritual to honor them (song, place, phrase).",
+        "Plan one kind thing for yourself this week.",
+        "Say: “Missing you means I loved you.”",
+        "Plant your feet and breathe into your belly.",
+    ],
+    "love": [
+        "Send a kind message without expecting a reply.",
+        "Note three things you appreciate about someone close.",
+        "Offer yourself one gentle act you needed today.",
+        "Listen fully to someone for one uninterrupted minute.",
+        "Give a sincere compliment to a stranger.",
+        "Prepare something with care for someone you value.",
+        "Say “thank you” out loud for one small thing.",
+        "Ask a caring question and wait for the answer.",
+        "Write what love means to you in three lines.",
+        "Plan a tiny gesture for tomorrow.",
+        "Look at your face kindly in the mirror for 10 seconds.",
+        "Let yourself accept help today.",
+    ],
+    "joy": [
+        "Pause and take three slow breaths to savor this.",
+        "Capture it — photo, note, or voice memo.",
+        "Tell someone why you feel good right now.",
+        "Move to music for one song.",
+        "Notice where the joy sits in your body.",
+        "Prepare a small treat to celebrate.",
+        "Write one line starting with “I’m glad that…”.",
+        "Do one kind act while you feel resourced.",
+        "Enjoy one minute of quiet appreciation.",
+        "Plan a tiny celebration later today.",
+        "Share a smile with someone nearby.",
+        "Thank yourself for the steps that led here.",
+    ],
+    "curiosity": [
+        "Search one concept and read just the first paragraph.",
+        "Ask a question you’ve never asked a friend.",
+        "Watch a “how does X work?” video for 3 minutes.",
+        "Write three quick “what if…?” ideas.",
+        "Take apart a small idea or object (safely) and observe.",
+        "Teach someone one thing you learned today.",
+        "Open a random article and summarize it in one line.",
+        "Try a new route or viewpoint in your space.",
+        "Learn one new word and use it once.",
+        "List five topics you’d like to explore.",
+        "Read one thread in a community you care about.",
+        "Sketch a simple diagram of an idea.",
+    ],
+    "gratitude": [
+        "List three tiny things that made today easier.",
+        "Thank someone by name for something specific.",
+        "Notice an everyday object and appreciate its help.",
+        "Take a photo of a small comfort.",
+        "Write “I’m lucky that…” and finish it once.",
+        "Send a short “thinking of you”.",
+        "Savor your next sip or bite with attention.",
+        "Name one privilege you have today.",
+        "Say thank you silently to your body.",
+        "Share one good thing with a friend.",
+        "Keep a short gratitude note in your phone.",
+        "Place a small reminder where you’ll see it tomorrow.",
+    ],
+    "neutral": [
+        "Take one slow breath and relax your hands.",
+        "Notice a color, a texture, and a sound around you.",
+        "Plan one tiny task to finish today.",
+        "Drink a glass of water mindfully.",
+        "Stand, stretch, and roll your shoulders.",
+        "Step outside for two minutes of fresh air.",
+        "Wipe your screen or desk for a reset.",
+        "Organize three items in your space.",
+        "Set a 10-minute timer to focus on one thing.",
+        "Do a gentle 30-second neck stretch.",
+        "Check your posture; support your back.",
+        "Open a window and take three breaths.",
+    ],
 }
 
+# One-line reasons
 WHY_BY_EMOTION = {
-    "sadness": "Small sensory and connection cues can ease low mood.",
-    "fear": "Grounding + longer exhales calm the threat system.",
-    "anger": "Space + movement lower adrenaline to respond, not react.",
-    "nervousness": "Slow breathing and micro-actions reduce anxious energy.",
-    "boredom": "Novelty and small starts re-engage attention.",
-    "grief": "Rituals and gentle care help carry love and loss.",
-    "love": "Expressing care strengthens bonds and self-kindness.",
-    "joy": "Savoring and sharing consolidate positive memories.",
-    "curiosity": "Small explorations feed learning and perspective.",
-    "gratitude": "Noticing support shifts attention toward strengths.",
-    "neutral": "Simple body care keeps your baseline steady.",
+    "sadness":     "Small sensory and connection cues can ease low mood and restore momentum.",
+    "fear":        "Grounding + longer exhales calm the threat system and signal safety.",
+    "anger":       "Space + movement lower adrenaline so you can respond, not react.",
+    "nervousness": "Slow breathing and micro-actions reduce anxious energy and create control.",
+    "boredom":     "Novelty and tiny starts re-engage attention and kick-off motivation.",
+    "grief":       "Rituals and gentle care help your body carry love and loss together.",
+    "love":        "Expressing and receiving care strengthens bonds and self-kindness.",
+    "joy":         "Savoring and sharing consolidate positive memories and resilience.",
+    "curiosity":   "Small explorations feed learning circuits and open perspective.",
+    "gratitude":   "Noticing support shifts attention toward resources and strengths.",
+    "neutral":     "Simple body care keeps your baseline steady for the rest of the day.",
 }
 
 COLOR_MAP = {
@@ -87,9 +256,19 @@ COLOR_MAP = {
     "neutral": "#F5F5F5", "curiosity": "#E6EE9C",
 }
 
-GOEMO_TO_APP = {"sadness": "sadness", "joy": "joy", "fear": "fear", "anger": "anger", "neutral": "neutral"}
+# Map 28 GoEmotions -> UI buckets
+GOEMO_TO_APP = {
+    "admiration": "gratitude", "amusement": "joy", "anger": "anger", "annoyance": "anger",
+    "approval": "gratitude", "caring": "love", "confusion": "nervousness",
+    "curiosity": "curiosity", "desire": "joy", "disappointment": "sadness",
+    "disapproval": "anger", "disgust": "anger", "embarrassment": "nervousness",
+    "excitement": "joy", "fear": "fear", "gratitude": "gratitude", "grief": "grief",
+    "joy": "joy", "love": "love", "nervousness": "nervousness", "optimism": "joy",
+    "pride": "joy", "realization": "neutral", "relief": "gratitude", "remorse": "grief",
+    "sadness": "sadness", "surprise": "neutral", "neutral": "neutral",
+}
 
-# ---------------- Helpers ----------------
+# ---------------- Preprocessing & thresholds (text) ----------------
 THRESHOLD_BASE = 0.30
 MIN_THRESHOLD = 0.10
 CLEAN_RE = re.compile(r"(https?://\S+)|(@\w+)|(#\w+)|[^a-zA-Z0-9\s']")
@@ -100,8 +279,37 @@ def clean_text(s: str) -> str:
     s = re.sub(r"\s+", " ", s).strip()
     return s
 
+EMOJI_HINTS = {"😭": "sadness", "😡": "anger", "🥰": "love", "😨": "fear", "😴": "boredom"}
+NEGATION_HINTS_EN = {
+    "not happy": "sadness", "not ok": "sadness", "no energy": "boredom",
+    "can't focus": "nervousness", "cannot focus": "nervousness"
+}
+HINTS_FR = {
+    "pas bien": "sadness", "triste": "sadness", "j'ai peur": "fear",
+    "angoisse": "nervousness", "anxieux": "nervousness",
+    "fatigué": "sadness", "épuisé": "sadness",
+}
+
 def augment_text(text: str, history=None) -> str:
-    return clean_text(text or "")
+    t = clean_text(text or "")
+    hints = []
+    for k in EMOJI_HINTS:
+        if k in (text or ""):
+            hints.append(EMOJI_HINTS[k])
+    for k in NEGATION_HINTS_EN:
+        if k in t:
+            hints.append(NEGATION_HINTS_EN[k])
+    lt = (text or "").lower()
+    for k in HINTS_FR:
+        if k in lt:
+            hints.append(HINTS_FR[k])
+    if history and len(t.split()) < 8:
+        prev_user = history[-1][0] if history and history[-1] else ""
+        if isinstance(prev_user, str) and prev_user:
+            t = t + " " + clean_text(prev_user)
+    if hints:
+        t = t + " " + " ".join([f"emo_{h}" for h in hints])
+    return t
 
 # ---------------- SQLite ----------------
 def get_conn():
@@ -123,7 +331,7 @@ def log_session(country, msg, emotion):
     conn.commit()
     conn.close()
 
-# ---------------- Model ----------------
+# ---------------- Text model: GoEmotions dataset-only ----------------
 def load_goemotions_dataset():
     ds = load_dataset("google-research-datasets/go_emotions", "simplified")
     return ds, ds["train"].features["labels"].feature.names
@@ -139,7 +347,10 @@ def train_or_load_model():
     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")),
-        ("ovr", OneVsRestClassifier(LogisticRegression(solver="saga", max_iter=1000, class_weight="balanced"), n_jobs=-1))
+        ("ovr", OneVsRestClassifier(
+            LogisticRegression(solver="saga", max_iter=1000, class_weight="balanced"),
+            n_jobs=-1
+        ))
     ])
     clf.fit(X_train, Y_train)
     joblib.dump({"version": MODEL_VERSION, "pipeline": clf, "mlb": mlb, "label_names": names}, MODEL_PATH)
@@ -151,6 +362,7 @@ except Exception as e:
     print("[ERROR] Model load/train:", e)
     CLASSIFIER, MLB, LABEL_NAMES = None, None, None
 
+# ---------------- Inference: TEXT ----------------
 def classify_text(text_augmented: str):
     if not CLASSIFIER: return []
     proba = CLASSIFIER.predict_proba([text_augmented])[0]
@@ -170,7 +382,7 @@ def detect_emotion_text(message: str, history):
         bucket[app] = max(bucket.get(app, 0.0), p)
     return max(bucket, key=bucket.get) if bucket else "neutral"
 
-# ---------------- Advice logic ----------------
+# ---------------- Advice selection ----------------
 def pick_advice_from_pool(emotion: str, pool: dict, last_tip: str = ""):
     tips_all = SUGGESTIONS.get(emotion, SUGGESTIONS["neutral"])
     entry = pool.get(emotion, {"unused": [], "last": ""})
@@ -187,10 +399,15 @@ def format_reply(emotion: str, tip: str) -> str:
     why = WHY_BY_EMOTION.get(emotion, WHY_BY_EMOTION["neutral"])
     return f"Try this now:\n• {tip}\n_(Why it helps: {why})_"
 
+# ---------------- Replies ----------------
 def crisis_block(country):
     msg = CRISIS_NUMBERS.get(country, CRISIS_NUMBERS["Other / Not listed"])
     return f"💛 You matter. If you're in danger or thinking of harming yourself, please reach out now.\n\n{msg}"
 
+def crisis_block_en(country):
+    msg = CRISIS_NUMBERS_EN.get(country, CRISIS_NUMBERS_EN["Other / Not listed"])
+    return "💛 You matter. If you're in danger or thinking of harming yourself, please reach out now.\n\n" + msg
+
 def chat_step(user_text, history, country, save_session, advice_pool):
     if user_text and CRISIS_RE.search(user_text):
         return crisis_block(country), "#FFD6E7", "neutral", "", advice_pool
@@ -212,11 +429,15 @@ init_db()
 
 with gr.Blocks(title="🪞 MoodMirror+ — Text Emotion • Advice-only") as demo:
     style = gr.HTML("")
-    gr.Markdown("### 🪞 MoodMirror+ — Emotion-aware advice\n_Not medical advice. If unsafe, please reach out for help._")
+    gr.Markdown(
+        "### 🪞 MoodMirror+ — Emotion-aware advice (text-only)\n"
+        "Classifier trained on GoEmotions (dataset-only). Each message is analysed anew.\n\n"
+        "_Not medical advice. If unsafe, please reach out for help._"
+    )
 
     with gr.Tabs():
-        # Tab 1 — Conseils
-        with gr.Tab("Conseils"):
+        # ---- Tab 1: Advice (chat) ----
+        with gr.Tab("Advice"):
             with gr.Row():
                 country = gr.Dropdown(list(CRISIS_NUMBERS.keys()), value="Other / Not listed", label="Country")
                 save_ok = gr.Checkbox(False, label="Save anonymized session")
@@ -244,42 +465,48 @@ with gr.Blocks(title="🪞 MoodMirror+ — Text Emotion • Advice-only") as dem
                 reply = format_reply(_emotion, tip)
                 return chat_hist + [[None, reply]], "", _emotion, tip, _pool
 
-            send.click(respond,
+            send.click(
+                respond,
                 inputs=[msg, chat, country, save_ok, last_emotion, last_tip, advice_pool],
                 outputs=[chat, style, last_emotion, last_tip, advice_pool],
-                queue=True)
-            msg.submit(respond,
+                queue=True
+            )
+            msg.submit(
+                respond,
                 inputs=[msg, chat, country, save_ok, last_emotion, last_tip, advice_pool],
                 outputs=[chat, style, last_emotion, last_tip, advice_pool],
-                queue=True)
-            regen.click(new_advice,
+                queue=True
+            )
+            regen.click(
+                new_advice,
                 inputs=[chat, last_emotion, last_tip, advice_pool],
                 outputs=[chat, style, last_emotion, last_tip, advice_pool],
-                queue=True)
+                queue=True
+            )
 
-        # Tab 2 — Numéros d'urgence
-        with gr.Tab("Numéros d'urgence"):
+        # ---- Tab 2: Emergency numbers (EN) ----
+        with gr.Tab("Emergency numbers"):
             gr.Markdown(
-                "#### 📟 Numéros d’urgence par pays\n"
-                "Sélectionne ton pays pour voir la ligne d’aide recommandée.\n"
-                "En cas de danger immédiat, compose **112** ou **911** selon ton pays."
+                "#### 📟 Emergency numbers by country\n"
+                "Select your country to see the recommended crisis line. "
+                "If you’re in immediate danger, call local emergency services (**112/911**) right away."
             )
 
             country_view = gr.Dropdown(
-                choices=list(CRISIS_NUMBERS.keys()),
-                value="France" if "France" in CRISIS_NUMBERS else list(CRISIS_NUMBERS.keys())[0],
-                label="Pays"
+                choices=list(CRISIS_NUMBERS_EN.keys()),
+                value="United States",
+                label="Country"
             )
-            crisis_info = gr.Markdown(value=crisis_block("France") if "France" in CRISIS_NUMBERS else crisis_block("Other / Not listed"))
+            crisis_info = gr.Markdown(value=crisis_block_en("United States"))
 
-            def show_crisis_for_country(c):
-                return crisis_block(c)
+            def show_crisis_for_country_en(c):
+                return crisis_block_en(c)
 
-            country_view.change(show_crisis_for_country, inputs=country_view, outputs=crisis_info)
+            country_view.change(show_crisis_for_country_en, inputs=country_view, outputs=crisis_info)
 
             gr.Markdown(
-                "> ℹ️ Ces numéros sont fournis à titre informatif. "
-                "Si ton pays n’est pas listé, contacte les services d’urgence locaux (**112/911**)."
+                "> ℹ️ Numbers may change. If a line doesn’t work or your country isn’t listed, "
+                "call local emergency services (**112/911**) or search **“suicide hotline” + your country**."
             )
 
 if __name__ == "__main__":