Update app.py

app.py

@@ -1,6 +1,6 @@
 # ================================
 # 🪞 MoodMirror+ — Text Emotion • Advice-only + brief intros & reasons
-# - Tabs: Advice • Emergency numbers • Breathing • Journal (export selected/delete/export all)
+# - Tabs: Advice • Emergency numbers • Breathing • Journal (edit + PDF export + export all)
 # - Gradio + sklearn compatibility fixes
 # ================================
 import os
@@ -21,6 +21,15 @@ from sklearn.linear_model import LogisticRegression
 from sklearn.multiclass import OneVsRestClassifier
 from sklearn.pipeline import Pipeline
 
+# --- Optional PDF deps ---
+try:
+    from reportlab.lib.pagesizes import A4
+    from reportlab.pdfgen import canvas
+    from reportlab.lib.units import mm
+    REPORTLAB_OK = True
+except Exception:
+    REPORTLAB_OK = False
+
 # ---------------- Storage paths ----------------
 def _pick_data_dir():
     if os.path.isdir("/data") and os.access("/data", os.W_OK):
@@ -192,6 +201,19 @@ def journal_get(entry_id: int):
     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."
+    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()
+    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),))
@@ -200,43 +222,111 @@ def journal_delete(entry_id: int):
     conn.close()
     return changes > 0
 
+# --- PDF helpers ---
+def _wrap_text(text, max_chars=90):
+    lines = []
+    for para in (text or "").split("\n"):
+        para = para.rstrip()
+        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)
+    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
+    def draw_line(s, size=11, bold=False, leading=14):
+        nonlocal y
+        if y < 30*mm:
+            c.showPage()
+            y = height - y_margin
+        c.setFont("Helvetica-Bold" if bold else "Helvetica", size)
+        c.drawString(x_margin, y, s)
+        y -= leading
+    # Header
+    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()
+
 def journal_export_txt(entry_id: int):
     data = journal_get(entry_id)
     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 = []
-    title = data["title"] or "(Untitled)"
-    lines.append(f"Title: {title}")
-    lines.append(f"Emotion: {data['emotion'] or '-'}")
-    lines.append(f"Saved (UTC): {data['ts']}")
-    lines.append("-" * 40)
-    lines.append(data["content"])
+    lines = [
+        f"Title: {data['title'] or '(Untitled)'}",
+        f"Emotion: {data['emotion'] or '-'}",
+        f"Saved (UTC): {data['ts']}",
+        "-" * 40,
+        data["content"] or ""
+    ]
     with open(fpath, "w", encoding="utf-8") as f:
         f.write("\n".join(lines))
     return fpath, f"Ready: {fname}"
 
-def journal_export_all_zip():
+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."
+    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)
+    _pdf_from_entry(fpath, data)
+    return fpath, f"PDF ready: {fname}"
+
+def journal_export_all_zip(pdf_first=True):
     conn = get_conn()
-    rows = list(conn.execute("SELECT id, ts, emotion, title, content FROM journal ORDER BY ts"))
+    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
+    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 (id_, ts, emo, title, content) in rows:
-            safe_title = re.sub(r"[^a-zA-Z0-9_\- ]", "_", title or "untitled")
-            fname = f"{ts[:19].replace(':','-')} - {safe_title}.txt"
-            text = (
-                f"Title: {title or '(Untitled)'}\n"
-                f"Emotion: {emo or '-'}\n"
-                f"Saved (UTC): {ts}\n"
-                f"{'-'*40}\n"
-                f"{content or ''}"
-            )
-            zf.writestr(fname, text)
-    return zip_name, f"Exported {len(rows)} entries."
+        for (entry_id,) in rows:
+            data = journal_get(entry_id)
+            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)
+                try: os.remove(tmp_pdf)
+                except: pass
+            else:
+                txt = (
+                    f"Title: {data['title'] or '(Untitled)'}\n"
+                    f"Emotion: {data['emotion'] or '-'}\n"
+                    f"Saved (UTC): {data['ts']}\n"
+                    f"{'-'*40}\n"
+                    f"{data['content'] or ''}"
+                )
+                arcname = f"{stamp} - {safe_title}.txt"
+                zf.writestr(arcname, txt)
+    msg = "Exported all as PDF." if use_pdf else "Exported all as TXT (install 'reportlab' for PDF)."
+    return zip_name, msg
 
 # ---------------- Model ----------------
 def load_goemotions_dataset():
@@ -256,12 +346,7 @@ 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,         # stronger regularization to help convergence
-                tol=1e-3,      # slightly looser tolerance
-                max_iter=5000, # more iterations
-                class_weight="balanced"
+                solver="saga", penalty="l2", C=0.5, tol=1e-3, max_iter=5000, class_weight="balanced"
             ),
             n_jobs=-1
         ))
@@ -412,12 +497,13 @@ with gr.Blocks(title="🪞 MoodMirror+ — Text Emotion • Advice-only") as dem
                 yield "✅ Done. Notice how your body feels."
             start_btn.click(run_breathing, inputs=[pattern, cycles], outputs=[breathe_out])
 
-        # ---- Tab 4: Journal (export selected/delete/export all) ----
+        # ---- Tab 4: Journal (edit + PDF export + export all) ----
         with gr.Tab("Journal"):
-            gr.Markdown("#### 📝 Personal journal\nWrite freely, then save. Entries are stored locally (SQLite).")
+            gr.Markdown("#### 📝 Personal journal\nWrite freely, then save. Re-open to edit. Export as PDF or all in a ZIP.")
 
+            # Editor
             with gr.Row():
-                j_title = gr.Textbox(label="Title (optional)", placeholder="e.g., A tough day at work")
+                j_title = gr.Textbox(label="Title", placeholder="e.g., A tough day at work")
                 j_emotion = gr.Dropdown(
                     choices=["neutral","sadness","fear","anger","nervousness","boredom","grief","love","joy","curiosity","gratitude"],
                     value="neutral", label="Emotion tag"
@@ -425,9 +511,13 @@ with gr.Blocks(title="🪞 MoodMirror+ — Text Emotion • Advice-only") as dem
             j_text = gr.Textbox(lines=10, label="Your entry", placeholder="Write whatever you want to get off your chest...")
 
             with gr.Row():
-                j_save = gr.Button("Save entry", variant="primary")
-                j_status = gr.Markdown()
+                j_save = gr.Button("Save as NEW", variant="primary")
+                j_update = gr.Button("Update selected", variant="secondary")
+                j_new = gr.Button("New (clear)")
 
+            j_status = gr.Markdown()
+
+            # Listing / search / preview
             gr.Markdown("##### Your entries")
             with gr.Row():
                 j_search = gr.Textbox(label="Search (title, text or emotion)", placeholder="e.g., anxiety, work, joy")
@@ -436,13 +526,14 @@ with gr.Blocks(title="🪞 MoodMirror+ — Text Emotion • Advice-only") as dem
             j_table = gr.Dataframe(headers=["UTC time","Emotion","Title","Preview"], value=[], interactive=False)
             j_view = gr.Markdown()
 
-            # Export + Delete + Export all UI
+            # Export / Delete
             with gr.Row():
-                j_export_btn = gr.Button("Export selected .txt")
-                j_export_file = gr.File(label="Download exported entry", visible=True)
+                j_export_txt_btn = gr.Button("Export selected .txt")
+                j_export_pdf_btn = gr.Button("Export selected PDF")
+                j_export_file = gr.File(label="Download exported file", visible=True)
                 j_delete_btn = gr.Button("Delete entry", variant="stop")
             with gr.Row():
-                j_export_all_btn = gr.Button("⬇️ Export all entries (.zip)")
+                j_export_all_btn = gr.Button("⬇️ Export ALL entries (.zip, PDFs if possible)")
                 j_export_all_file = gr.File(label="Download all entries", visible=True)
 
             # --------------- Backend ---------------
@@ -457,20 +548,38 @@ with gr.Blocks(title="🪞 MoodMirror+ — Text Emotion • Advice-only") as dem
                 clear_title = "" if ok else title
                 return msg, drop, table, clear_text, clear_title
 
-            def _load_entry(entry_id):
-                if entry_id is None: return ""
+            def _update_entry(entry_id, title, text, emotion, search):
+                ok, msg = journal_update(entry_id, title, text, emotion)
+                drop, table = _refresh_entries(search)
+                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)
-                if not data: return "Entry not found."
+                if not data:
+                    return "", "neutral", "", "Entry not found."
                 title_line = f"### {data['title']}" if data['title'] else "### (Untitled)"
                 emo_line = f"**Emotion:** {data['emotion'] or '—'}  \n**Saved (UTC):** {data['ts']}"
-                return f"{title_line}\n\n{emo_line}\n\n---\n\n{data['content']}"
+                preview = f"{title_line}\n\n{emo_line}\n\n---\n\n{data['content']}"
+                return data["title"], data["emotion"] or "neutral", data["content"], preview
 
-            def _export_entry(entry_id):
+            def _new_entry():
+                return "", "neutral", "", "Cleared. You can write a new entry."
+
+            def _export_txt(entry_id):
                 if entry_id is None:
-                    return None, "Select an entry to export."
+                    return None, "Select an entry to export (.txt)."
                 path, msg = journal_export_txt(int(entry_id))
                 return path, msg
 
+            def _export_pdf(entry_id):
+                if entry_id is None:
+                    return None, "Select an entry to export (PDF)."
+                path, msg = journal_export_pdf(int(entry_id))
+                return path, msg
+
             def _delete_entry(entry_id, search):
                 if entry_id is None:
                     status = "Select an entry to delete."
@@ -482,19 +591,31 @@ with gr.Blocks(title="🪞 MoodMirror+ — Text Emotion • Advice-only") as dem
                 return status, drop, table, ""
 
             def _export_all():
-                path, msg = journal_export_all_zip()
+                path, msg = journal_export_all_zip(pdf_first=True)
                 return path, msg
 
             # Wire actions
             j_save.click(_save_entry, inputs=[j_title, j_text, j_emotion, j_search],
                          outputs=[j_status, j_entries, j_table, j_text, j_title])
+
+            j_update.click(_update_entry, inputs=[j_entries, j_title, j_text, j_emotion, j_search],
+                           outputs=[j_status, j_entries, j_table])
+
+            j_new.click(_new_entry, outputs=[j_title, j_emotion, j_text, j_view])
+
             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])
-            j_entries.change(_load_entry, inputs=[j_entries], outputs=[j_view])
 
-            j_export_btn.click(_export_entry, inputs=[j_entries], outputs=[j_export_file, j_status])
+            # 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])
+
+            j_export_txt_btn.click(_export_txt, inputs=[j_entries], outputs=[j_export_file, j_status])
+            j_export_pdf_btn.click(_export_pdf, inputs=[j_entries], outputs=[j_export_file, j_status])
+
             j_delete_btn.click(_delete_entry, inputs=[j_entries, j_search],
                                outputs=[j_status, j_entries, j_table, j_view])
+
             j_export_all_btn.click(_export_all, outputs=[j_export_all_file, j_status])
 
 if __name__ == "__main__":