Update app.py

app.py

@@ -420,22 +420,23 @@ def _parse_ids(text, valid_ids):
     import re as _re
     return [int(n) for n in _re.findall(r'\b(\d+)\b', text) if int(n) in valid_ids]
 
-def _chat_msg(role, text):
-    """Return a (user_msg, assistant_msg) tuple for Gradio Chatbot (non-messages mode)."""
-    if role == "assistant":
-        return (None, text)
-    else:
-        return (text, None)
+def _bot(text):
+    """Return assistant message dict for Gradio Chatbot type='messages'."""
+    return {"role": "assistant", "content": text}
+
+def _usr(text):
+    """Return user message dict for Gradio Chatbot type='messages'."""
+    return {"role": "user", "content": text}
 
 def handle_start_journal(user_id):
     blank_outputs = ([], [], False,
                      gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False),
                      [], "marking", "")
     if not user_id:
-        return ([(None, "\u26a0 Please sign in first.")],) + blank_outputs[1:]
+        return ([_bot("\u26a0 Please sign in first.")],) + blank_outputs[1:]
     tasks = get_tasks(user_id, only_today=True)
     if not tasks:
-        return ([(None, "No tasks scheduled for today. Add and schedule tasks first, then come back to reflect!")],) + blank_outputs[1:]
+        return ([_bot("No tasks scheduled for today. Add and schedule tasks first, then come back to reflect!")],) + blank_outputs[1:]
 
     tasks_state = [{
         "task_id": t["id"], "title": t["title"], "life_area": t.get("life_area",""),
@@ -460,7 +461,7 @@ def handle_start_journal(user_id):
                   f"Done: **{completed}/{total}**. Still open: {inc_str}. "
                   f"Tell me if you finished any more, or say **skip** to reflect.")
 
-    chat = [(None, opener)]
+    chat = [_bot(opener)]
     hist = [{"role": "assistant", "content": opener, "focus": "task_review"}]
     return (
         chat, hist, True,
@@ -478,14 +479,14 @@ def handle_journal_message(user_id, user_text, audio_path, chat, hist, tasks_sta
                 user_text = transcribed
                 voice_used = True
         except Exception as e:
-            chat = list(chat) + [(None, f"\u26a0 Transcription error: {e}. Please type instead.")]
+            chat = list(chat) + [_bot(f"\u26a0 Transcription error: {e}. Please type instead.")]
             return chat, hist, "", None, tasks_state, active, phase, ""
 
     if not active or not user_text.strip():
         return list(chat), hist, "", None, tasks_state, active, phase, ""
 
     display_text = f"\U0001f3a4 *{user_text}*" if voice_used else user_text
-    chat = list(chat) + [(display_text, None)]
+    chat = list(chat) + [_usr(display_text)]
     hist = list(hist) + [{"role": "user", "content": user_text}]
 
     # Phase: marking tasks
@@ -509,14 +510,14 @@ def handle_journal_message(user_id, user_text, audio_path, chat, hist, tasks_sta
             ctx     = _ensure_context(user_id)
             opening = build_opening_question(ctx, tasks_state)
             bridge  = confirm + opening["question"]
-            chat    = list(chat) + [(None, bridge)]
+            chat    = list(chat) + [_bot(bridge)]
             hist.append({"role": "assistant", "content": bridge, "focus": opening["question_focus"]})
             return chat, hist, "", None, tasks_state, active, "reflecting", ""
         else:
             remaining = [t for t in tasks_state if not t["completed"]]
             rem_str   = " | ".join(f"#{t['task_id']} {t['title']}" for t in remaining[:5])
             follow    = confirm + f"Still pending: {rem_str}\n\nAnything else done? Or say **skip** to start reflecting."
-            chat      = list(chat) + [(None, follow)]
+            chat      = list(chat) + [_bot(follow)]
             hist.append({"role": "assistant", "content": follow, "focus": "task_marking"})
             return chat, hist, "", None, tasks_state, active, "marking", ""
 
@@ -526,34 +527,34 @@ def handle_journal_message(user_id, user_text, audio_path, chat, hist, tasks_sta
             ctx    = _ensure_context(user_id)
             result = get_next_journal_question(ctx, tasks_state, hist)
         except Exception as e:
-            chat = list(chat) + [(None, f"\u26a0 AI error: {e}. Try again.")]
+            chat = list(chat) + [_bot(f"\u26a0 AI error: {e}. Try again.")]
             return chat, hist, "", None, tasks_state, active, phase, ""
 
         if result.get("session_complete"):
             closing = "That's a solid reflection \u2014 I have plenty to work with. \U0001f9e0 Hit **Finish & Save** to lock in your insights!"
-            chat    = list(chat) + [(None, closing)]
+            chat    = list(chat) + [_bot(closing)]
             hist.append({"role": "assistant", "content": closing, "focus": "complete"})
             return chat, hist, "", None, tasks_state, active, "done", _ok("Session complete \u2014 click Finish & Save")
 
         next_q = result.get("question") or "Anything else you'd like to reflect on?"
-        chat   = list(chat) + [(None, next_q)]
+        chat   = list(chat) + [_bot(next_q)]
         hist.append({"role": "assistant", "content": next_q, "focus": result.get("question_focus","")})
         return chat, hist, "", None, tasks_state, active, "reflecting", ""
 
     # Phase: done
-    chat = list(chat) + [(None, "Session complete! Click **Finish & Save** to save your insights.")]
+    chat = list(chat) + [_bot("Session complete! Click **Finish & Save** to save your insights.")]
     return chat, hist, "", None, tasks_state, active, "done", ""
 
 
 def handle_finish_journal(user_id, chat, hist, tasks_state):
     if not user_id or not hist:
-        return list(chat) + [(None, "\u26a0 Nothing to save yet.")], ""
+        return list(chat) + [_bot("\u26a0 Nothing to save yet.")], ""
     try:
         ctx     = _ensure_context(user_id)
         updated = synthesize_journal(ctx, tasks_state, hist)
         save_user_context(user_id, updated)
     except Exception as e:
-        return list(chat) + [(None, f"\u26a0 Save failed: {e}")], _err("Save failed")
+        return list(chat) + [_bot(f"\u26a0 Save failed: {e}")], _err("Save failed")
     total    = len(tasks_state)
     done     = sum(1 for t in tasks_state if t.get("completed"))
     rate     = round(done / total * 100) if total else 0
@@ -562,7 +563,7 @@ def handle_finish_journal(user_id, chat, hist, tasks_state):
     summary  = (f"\u2705 **Insights saved!** {done}/{total} tasks ({rate}%) complete today.\n\n"
                 f"**What I learned:**\n{notes_md}\n\n"
                 f"I'll use this to make tomorrow's scheduling smarter. Great work! \U0001f319")
-    return list(chat) + [(None, summary)], _ok(f"Saved! {done}/{total} tasks ({rate}%)")
+    return list(chat) + [_bot(summary)], _ok(f"Saved! {done}/{total} tasks ({rate}%)")
 
 def handle_restart_journal():
     return [], [], False, gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False), [], "marking", ""
@@ -864,7 +865,7 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
                         gr.HTML('<p style="color:#475569;font-size:12px;margin:0 0 10px">Deadline is auto-extracted from your text. Date will be assigned by the AI scheduler.</p>')
                         with gr.Row():
                             f_title = gr.Textbox(label="Title", scale=3)
-                            f_area  = gr.Dropdown(label="Life Area", choices=["Work","Health","Finance","Learning","Personal","Family","Other"], scale=1)
+                            f_area  = gr.Dropdown(label="Life Area", choices=["Work","Health","Finance","Learning","Personal","Family","Other"], scale=1, allow_custom_value=True)
                         with gr.Row():
                             f_urgency    = gr.Dropdown(label="Urgency",       choices=["Urgent","Not Urgent","Habit"],                value="Not Urgent")
                             f_importance = gr.Dropdown(label="Importance",    choices=["Move the Needle","Important","Not Important"], value="Important")
@@ -900,7 +901,7 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
                         gr.HTML('<div class="sec-label" style="margin-top:12px">Review & Confirm</div>')
                         with gr.Row():
                             vf_title = gr.Textbox(label="Title", scale=3)
-                            vf_area  = gr.Dropdown(label="Life Area", choices=["Work","Health","Finance","Learning","Personal","Family","Other"], scale=1)
+                            vf_area  = gr.Dropdown(label="Life Area", choices=["Work","Health","Finance","Learning","Personal","Family","Other"], scale=1, allow_custom_value=True)
                         with gr.Row():
                             vf_urgency    = gr.Dropdown(label="Urgency",       choices=["Urgent","Not Urgent","Habit"],                value="Not Urgent")
                             vf_importance = gr.Dropdown(label="Importance",    choices=["Move the Needle","Important","Not Important"], value="Important")
@@ -969,7 +970,7 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
             # ── TAB 3: JOURNAL ────────────────────────────────────────────
             with gr.Tab("\U0001f4d3 Journal"):
                 gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:12px">End-of-day reflection. Chat naturally \u2014 AI marks tasks, asks questions, updates your profile.</p>')
-                journal_chatbot = gr.Chatbot(label="", height=440)
+                journal_chatbot = gr.Chatbot(label="", height=440, type="messages")
                 with gr.Row():
                     j_answer   = gr.Textbox(label="", placeholder="Type or use the mic\u2026", lines=1, scale=5, interactive=False, show_label=False)
                     j_audio_in = gr.Audio(sources=["microphone"], type="filepath", label="\U0001f3a4", scale=1, interactive=False)