Update app.py

app.py

@@ -1,7 +1,6 @@
 # ================================
-# 🪞 MoodMirror+ — Text Emotion • Advice-only + brief intros & reasons
-# - Tabs: Advice • Emergency numbers • Breathing • Journal (edit + PDF export + export all)
-# - Gradio + sklearn compatibility fixes
+# 🪞 MoodMirror+ — Emotion-aware Advice • Breathing • Journal
+# - Tabs: Advice • Emergency numbers • Breathing • Journal (edit + PDF + export all)
 # ================================
 import os
 import re
@@ -21,7 +20,7 @@ from sklearn.linear_model import LogisticRegression
 from sklearn.multiclass import OneVsRestClassifier
 from sklearn.pipeline import Pipeline
 
-# --- Optional PDF deps ---
+# ---- Optional PDF deps ----
 try:
     from reportlab.lib.pagesizes import A4
     from reportlab.pdfgen import canvas
@@ -40,7 +39,7 @@ 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 = "v11-text-only-intro-reason"
+MODEL_VERSION = "v13-all-maps-hints"
 
 # ---------------- Crisis & closing ----------------
 CRISIS_RE = re.compile(
@@ -52,7 +51,7 @@ CLOSING_RE = re.compile(
     re.I,
 )
 
-# English crisis numbers (expanded)
+# English crisis numbers
 CRISIS_NUMBERS_EN = {
     "United States": "📞 **988** (Suicide & Crisis Lifeline, 24/7)",
     "Canada": "📞 **988** (Suicide Crisis Helpline, 24/7)",
@@ -72,19 +71,85 @@ CRISIS_NUMBERS_EN = {
     "Other / Not listed": "Call local emergency (**112/911**) or search “suicide hotline” + your country.",
 }
 
-# ---------------- Advice library (concise) ----------------
+# ---------------- Advice library (5 tips each) ----------------
 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 your shoulders relaxing.",
+        "Text a safe person: “Can I vent for 2 minutes?”",
+        "Wrap in a blanket and slow your exhale for 60 seconds.",
+    ],
+    "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.",
+        "Hold something cool (spoon/ice) for 30 seconds and notice the sensation.",
+        "Name the fear in one clear sentence out loud.",
+        "Write the worst case, then the most likely case beside it.",
+    ],
+    "anger": [
+        "Take space before replying; set a 10-minute timer.",
+        "Do ten slow exhales through pursed lips.",
+        "Squeeze then release your fists ten times.",
+        "Walk fast for five minutes or do one stair flight.",
+        "Write the crossed boundary; draft one calm sentence.",
+    ],
+    "nervousness": [
+        "4-7-8 breathing: in 4s, hold 7s, out 8s (four rounds).",
+        "Relax your jaw and lower your shoulders.",
+        "Write worries down; underline what you can control.",
+        "Pick one tiny task you can finish in five minutes.",
+        "Hold a warm mug and notice the heat and weight.",
+    ],
+    "boredom": [
+        "Set a 2-minute timer and start anything small.",
+        "Change your soundtrack—put on one new song.",
+        "Do 15 jumping jacks or a quick stretch.",
+        "Clean your phone screen or keyboard.",
+        "Write five quick ideas without editing.",
+    ],
+    "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.",
+        "Create a tiny ritual (song, candle, place).",
+        "Plan one kind thing for yourself this week.",
+    ],
+    "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.",
+        "Give a sincere compliment to a stranger.",
+        "Plan a tiny gesture for tomorrow.",
+    ],
+    "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.",
+        "Plan a tiny celebration later today.",
+    ],
+    "curiosity": [
+        "Search one concept and read just the first paragraph.",
+        "Write three quick “what if…?” ideas.",
+        "Watch a “how does X work?” video for 3 minutes.",
+        "Learn one new word and use it once.",
+        "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.",
+        "Write “I’m lucky that…” and complete it once.",
+        "Savor your next sip or bite with attention.",
+    ],
+    "neutral": [
+        "Take one slow breath and relax your hands.",
+        "Stand, stretch, and roll your shoulders.",
+        "Drink a glass of water mindfully.",
+        "Organize three items in your space.",
+        "Set a 10-minute timer to focus on one thing.",
+    ],
 }
 
 WHY_BY_EMOTION = {
@@ -109,15 +174,51 @@ COLOR_MAP = {
     "neutral": "#F5F5F5", "curiosity": "#E6EE9C",
 }
 
+# Map all 28 GoEmotions -> UI buckets (fixes "always neutral")
 GOEMO_TO_APP = {
-    "sadness": "sadness", "joy": "joy", "fear": "fear", "anger": "anger", "neutral": "neutral",
+    "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",
 }
 
-# ---------------- Preprocessing ----------------
-THRESHOLD_BASE = 0.30
-MIN_THRESHOLD = 0.10
+# ---------------- Preprocessing & Hints ----------------
 CLEAN_RE = re.compile(r"(https?://\S+)|(@\w+)|(#\w+)|[^a-zA-Z0-9\s']")
 
+EMOJI_HINTS = {"😭": "sadness", "😡": "anger", "🥰": "love", "😨": "fear", "😴": "boredom"}
+HINTS_EN = {
+    "i'm nervous": "nervousness", "im nervous": "nervousness", "nervous": "nervousness",
+    "anxious": "nervousness", "anxiety": "nervousness", "panic": "nervousness",
+    "i'm grieving": "grief", "im grieving": "grief", "grieving": "grief", "grief": "grief",
+    "sad": "sadness", "depressed": "sadness",
+    "angry": "anger", "furious": "anger",
+    "afraid": "fear", "scared": "fear",
+}
+
 def clean_text(s: str) -> str:
     s = s.lower()
     s = CLEAN_RE.sub(" ", s)
@@ -125,7 +226,22 @@ def clean_text(s: str) -> str:
     return s
 
 def augment_text(text: str, history=None) -> str:
-    return clean_text(text or "")
+    t = clean_text(text or "")
+    lt = (text or "").lower()
+    tags = []
+    for k, v in EMOJI_HINTS.items():
+        if k in lt:
+            tags.append(v)
+    for k, v in HINTS_EN.items():
+        if k in lt:
+            tags.append(v)
+    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 += " " + clean_text(prev_user)
+    if tags:
+        t += " " + " ".join(f"emo_{x}" for x in tags)
+    return t
 
 # ---------------- SQLite ----------------
 def get_conn():
@@ -133,18 +249,13 @@ def get_conn():
 
 def init_db():
     conn = get_conn()
-    # sessions
     conn.execute("""CREATE TABLE IF NOT EXISTS sessions(
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         ts TEXT, country TEXT, user_text TEXT, main_emotion TEXT
     )""")
-    # journal
     conn.execute("""CREATE TABLE IF NOT EXISTS journal(
         id INTEGER PRIMARY KEY AUTOINCREMENT,
-        ts TEXT NOT NULL,
-        emotion TEXT,
-        title TEXT,
-        content TEXT
+        ts TEXT NOT NULL, emotion TEXT, title TEXT, content TEXT
     )""")
     conn.commit()
     conn.close()
@@ -165,7 +276,7 @@ def journal_save(title: str, content: str, emotion: str):
     ts = datetime.utcnow().isoformat(timespec='seconds')
     conn = get_conn()
     conn.execute("INSERT INTO journal(ts, emotion, title, content) VALUES (?,?,?,?)",
-        (ts, emotion or "", title, content))
+                 (ts, emotion or "", title, content))
     conn.commit()
     conn.close()
     return True, f"Saved ✓ ({ts} UTC)."
@@ -175,15 +286,10 @@ def journal_list(search: str = "", limit: int = 50):
     params = []
     if search:
         q += " WHERE (LOWER(title) LIKE ? OR LOWER(content) LIKE ? OR LOWER(emotion) LIKE ?)"
-        s = f"%{search.lower()}%"
-        params = [s, s, s]
-    q += " ORDER BY ts DESC LIMIT ?"
-    params.append(int(limit))
-    conn = get_conn()
-    rows = list(conn.execute(q, params))
-    conn.close()
-    options = []
-    table = []
+        s = f"%{search.lower()}%"; params = [s, s, s]
+    q += " ORDER BY ts DESC LIMIT ?"; params.append(int(limit))
+    conn = get_conn(); rows = list(conn.execute(q, params)); conn.close()
+    options, table = [], []
     for (id_, ts, emo, title, content) in rows:
         label = f"{ts} — [{(emo or 'neutral')}] {title or (content[:30] + ('…' if len(content) > 30 else ''))}"
         options.append((label, id_))
@@ -195,34 +301,28 @@ def journal_list(search: str = "", limit: int = 50):
 def journal_get(entry_id: int):
     conn = get_conn()
     cur = conn.execute("SELECT ts, emotion, title, content FROM journal WHERE id = ?", (int(entry_id),))
-    row = cur.fetchone()
-    conn.close()
+    row = cur.fetchone(); conn.close()
     if not row: return None
     ts, emo, title, content = row
     return {"ts": ts, "emotion": emo or "", "title": title or "", "content": content or ""}
 
 def journal_update(entry_id: int, title: str, content: str, emotion: str):
     if entry_id is None: return False, "No entry selected."
-    title = (title or "").strip()
-    content = (content or "").strip()
-    if not content:
-        return False, "Entry content cannot be empty."
+    title = (title or "").strip(); content = (content or "").strip()
+    if not content: return False, "Entry content cannot be empty."
     conn = get_conn()
-    cur = conn.execute("UPDATE journal SET title=?, content=?, emotion=? WHERE id=?", (title, content, emotion or "", int(entry_id)))
-    conn.commit()
-    ok = (cur.rowcount or 0) > 0
-    conn.close()
+    cur = conn.execute("UPDATE journal SET title=?, content=?, emotion=? WHERE id=?",
+                       (title, content, emotion or "", int(entry_id)))
+    conn.commit(); ok = (cur.rowcount or 0) > 0; conn.close()
     return ok, ("Updated ✓" if ok else "Entry not found.")
 
 def journal_delete(entry_id: int):
     conn = get_conn()
     cur = conn.execute("DELETE FROM journal WHERE id = ?", (int(entry_id),))
-    conn.commit()
-    changes = conn.total_changes
-    conn.close()
+    conn.commit(); changes = conn.total_changes; conn.close()
     return changes > 0
 
-# --- PDF helpers ---
+# ---- PDF helpers ----
 def _wrap_text(text, max_chars=90):
     lines = []
     for para in (text or "").split("\n"):
@@ -230,42 +330,32 @@ def _wrap_text(text, max_chars=90):
         while len(para) > max_chars:
             cut = para.rfind(" ", 0, max_chars)
             if cut == -1: cut = max_chars
-            lines.append(para[:cut])
-            para = para[cut:].lstrip()
+            lines.append(para[:cut]); para = para[cut:].lstrip()
         lines.append(para)
     return lines
 
 def _pdf_from_entry(path, data):
-    # Minimal PDF render with reportlab
     c = canvas.Canvas(path, pagesize=A4)
     width, height = A4
-    x_margin = 20*mm
-    y_margin = 20*mm
-    y = height - y_margin
+    x_margin = 20*mm; y_margin = 20*mm; y = height - y_margin
     def draw_line(s, size=11, bold=False, leading=14):
         nonlocal y
         if y < 30*mm:
-            c.showPage()
-            y = height - y_margin
+            c.showPage(); y = height - y_margin
         c.setFont("Helvetica-Bold" if bold else "Helvetica", size)
-        c.drawString(x_margin, y, s)
-        y -= leading
-    # Header
+        c.drawString(x_margin, y, s); y -= leading
     title = data["title"] or "(Untitled)"
     draw_line(f"Title: {title}", size=14, bold=True, leading=18)
     draw_line(f"Emotion: {data['emotion'] or '-'}")
     draw_line(f"Saved (UTC): {data['ts']}")
     draw_line("-"*80)
-    # Body
     for ln in _wrap_text(data["content"], 95):
         draw_line(ln)
-    c.showPage()
-    c.save()
+    c.showPage(); c.save()
 
 def journal_export_txt(entry_id: int):
     data = journal_get(entry_id)
-    if not data:
-        return None, "Entry not found."
+    if not data: return None, "Entry not found."
     fname = f"journal_{entry_id}_{data['ts'].replace(':','-')}.txt"
     fpath = os.path.join(DATA_DIR, fname)
     lines = [
@@ -275,16 +365,14 @@ def journal_export_txt(entry_id: int):
         "-" * 40,
         data["content"] or ""
     ]
-    with open(fpath, "w", encoding="utf-8") as f:
-        f.write("\n".join(lines))
+    with open(fpath, "w", encoding="utf-8") as f: f.write("\n".join(lines))
     return fpath, f"Ready: {fname}"
 
 def journal_export_pdf(entry_id: int):
     if not REPORTLAB_OK:
         return None, "PDF export requires 'reportlab' (pip install reportlab)."
     data = journal_get(entry_id)
-    if not data:
-        return None, "Entry not found."
+    if not data: return None, "Entry not found."
     safe_title = re.sub(r"[^a-zA-Z0-9_\- ]", "_", data["title"] or "untitled")
     fname = f"journal_{entry_id}_{data['ts'][:19].replace(':','-')} - {safe_title}.pdf"
     fpath = os.path.join(DATA_DIR, fname)
@@ -292,27 +380,20 @@ def journal_export_pdf(entry_id: int):
     return fpath, f"PDF ready: {fname}"
 
 def journal_export_all_zip(pdf_first=True):
-    conn = get_conn()
-    rows = list(conn.execute("SELECT id FROM journal ORDER BY ts"))
-    conn.close()
-    if not rows:
-        return None, "No entries to export."
-    # Try PDFs if requested & available, else fall back to txt
+    conn = get_conn(); rows = list(conn.execute("SELECT id FROM journal ORDER BY ts")); conn.close()
+    if not rows: return None, "No entries to export."
     use_pdf = pdf_first and REPORTLAB_OK
     zip_name = os.path.join(DATA_DIR, "journal_all.zip")
     with zipfile.ZipFile(zip_name, "w", zipfile.ZIP_DEFLATED) as zf:
         for (entry_id,) in rows:
             data = journal_get(entry_id)
-            if not data: 
-                continue
+            if not data: continue
             safe_title = re.sub(r"[^a-zA-Z0-9_\- ]", "_", data["title"] or "untitled")
             stamp = data["ts"][:19].replace(":", "-")
             if use_pdf:
-                # write to a temp pdf then add
                 tmp_pdf = os.path.join(DATA_DIR, f"_tmp_{entry_id}.pdf")
                 _pdf_from_entry(tmp_pdf, data)
-                arcname = f"{stamp} - {safe_title}.pdf"
-                zf.write(tmp_pdf, arcname=arcname)
+                zf.write(tmp_pdf, arcname=f"{stamp} - {safe_title}.pdf")
                 try: os.remove(tmp_pdf)
                 except: pass
             else:
@@ -323,12 +404,11 @@ def journal_export_all_zip(pdf_first=True):
                     f"{'-'*40}\n"
                     f"{data['content'] or ''}"
                 )
-                arcname = f"{stamp} - {safe_title}.txt"
-                zf.writestr(arcname, txt)
+                zf.writestr(f"{stamp} - {safe_title}.txt", txt)
     msg = "Exported all as PDF." if use_pdf else "Exported all as TXT (install 'reportlab' for PDF)."
     return zip_name, msg
 
-# ---------------- Model ----------------
+# ---------------- Text model ----------------
 def load_goemotions_dataset():
     ds = load_dataset("google-research-datasets/go_emotions", "simplified")
     return ds, ds["train"].features["labels"].feature.names
@@ -346,7 +426,12 @@ def train_or_load_model():
         ("tfidf", TfidfVectorizer(lowercase=True, ngram_range=(1,2), min_df=2, max_df=0.9, strip_accents="unicode")),
         ("ovr", OneVsRestClassifier(
             LogisticRegression(
-                solver="saga", penalty="l2", C=0.5, tol=1e-3, max_iter=5000, class_weight="balanced"
+                solver="saga",
+                penalty="l2",
+                C=0.5,
+                tol=1e-3,
+                max_iter=5000,
+                class_weight="balanced"
             ),
             n_jobs=-1
         ))
@@ -365,22 +450,21 @@ def classify_text(text_augmented: str):
     if not CLASSIFIER: return []
     proba = CLASSIFIER.predict_proba([text_augmented])[0]
     max_p = float(np.max(proba)) if len(proba) else 0.0
-    thr = max(MIN_THRESHOLD, THRESHOLD_BASE * max_p + 0.15)
+    thr = max(0.10, 0.30 * max_p + 0.15)
     idxs = [i for i, p in enumerate(proba) if p >= thr] or [int(np.argmax(proba))]
     idxs.sort(key=lambda i: proba[i], reverse=True)
     return [(LABEL_NAMES[i], float(proba[i])) for i in idxs]
 
 def detect_emotion_text(message: str, history):
     labels = classify_text(augment_text(message, history))
-    if not labels:
-        return "neutral"
+    if not labels: return "neutral"
     bucket = {}
     for lbl, p in labels:
         app = GOEMO_TO_APP.get(lbl.lower(), "neutral")
         bucket[app] = max(bucket.get(app, 0.0), p)
     return max(bucket, key=bucket.get) if bucket else "neutral"
 
-# ---------------- Advice logic ----------------
+# ---------------- Advice engine ----------------
 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": ""})
@@ -554,7 +638,6 @@ with gr.Blocks(title="🪞 MoodMirror+ — Text Emotion • Advice-only") as dem
                 return msg, drop, table
 
             def _load_entry_fill(entry_id):
-                """Load selected entry into editor + preview."""
                 if entry_id is None:
                     return "", "neutral", "", ""
                 data = journal_get(entry_id)
@@ -606,7 +689,6 @@ with gr.Blocks(title="🪞 MoodMirror+ — Text Emotion • Advice-only") as dem
             j_refresh.click(_refresh_entries, inputs=[j_search], outputs=[j_entries, j_table])
             j_search.submit(_refresh_entries, inputs=[j_search], outputs=[j_entries, j_table])
 
-            # Selecting an entry both fills the editor and shows preview
             j_entries.change(_load_entry_fill, inputs=[j_entries],
                              outputs=[j_title, j_emotion, j_text, j_view])