Add the 5 questions to the profile questionnaire that Dr. Tariman suggested

app.py

@@ -1,7 +1,7 @@
 """
 MyeAI (Myeloma AI)
 ===========================================================
-Takes a participant's answers to the 16 Shared Decision Making questions
+Takes a participant's answers to the 21 Shared Decision Making questions
 and runs an adaptive follow-up conversation using Google's Gemini API.
 
 GROUNDING:
@@ -46,7 +46,7 @@ from supabase_store import (SupabaseStore, normalize_email, is_valid_email,
                             user_ids_match, CONFLICT)
 
 # ----------------------------------------------------------------------
-# The 16 profile questions (verbatim from the intake form)
+# The 21 profile questions (verbatim from the intake form)
 # ----------------------------------------------------------------------
 QUESTIONS = [
     "I prefer my healthcare team (hematologist, nurse practitioner, or physician assistant), and I collaborate in deciding which treatment for relapsed or refractory myeloma is best for me",
@@ -65,6 +65,10 @@ QUESTIONS = [
     "My out-of-pocket cost of treatment is important to me",
     "I prefer to continue an active lifestyle during my myeloma treatment",
     "I worry about how my treatment will affect future treatment options",
+    "I have received an autologous stem cell transplant",
+    "I have received CAR-T therapy",
+    "This is my first relapse from myeloma",
+    "I am refractory to proteasome inhibitors or PIs and immunomodulatory drugs or IMiDs",
 ]
 
 # Short tags used for the summary view
@@ -85,6 +89,11 @@ QUESTION_TAGS = [
     "Out-of-pocket cost matters",
     "Wants active lifestyle",
     "Worries about future options",
+    "Prior autologous stem cell transplant",
+    "Prior CAR-T therapy",
+    "Prior bispecific therapy",
+    "First myeloma relapse",
+    "Refractory to PI and IMiD",
 ]
 
 MODEL = "gemini-2.5-flash"
@@ -116,14 +125,14 @@ def ensure_kb(client):
 
 # ----------------------------------------------------------------------
 # Supabase persistence — every participant is identified by their email.
-# Their 16 answers and their whole conversation are written to Supabase as
+# Their 21 answers and their whole conversation are written to Supabase as
 # they go, and restored automatically when they sign back in.
 # ----------------------------------------------------------------------
 STORE = SupabaseStore()
 
 
 def _coerce_answers(value):
-    """Normalize a stored answers list into exactly 16 'Yes'/'No'/None values."""
+    """Normalize a stored answers list into exactly 21 'Yes'/'No'/None values."""
     out = [None] * len(QUESTIONS)
     if isinstance(value, list):
         for i, v in enumerate(value[: len(QUESTIONS)]):
@@ -240,11 +249,11 @@ def _user_badge(user_id):
     return f"User ID<br><strong>{html.escape(user_id)}</strong>"
 
 
-ANSWERS_SUMMARY_HEADING = "**Your responses to the 16 questions**"
+ANSWERS_SUMMARY_HEADING = "**Your responses to the 21 questions**"
 
 
 def build_answers_summary(answers):
-    """The 16 questions and this participant's answers, shown as the opening
+    """The 21 questions and this participant's answers, shown as the opening
     message of the chat so they can see the profile the conversation is built
     on without leaving the conversation."""
     lines = [ANSWERS_SUMMARY_HEADING, ""]
@@ -393,7 +402,7 @@ def system_instruction():
         "5. Tone: empathetic, respectful, never alarming.\n"
         "6. TREATMENT-OPTIONS QUESTION: When the patient asks what the best treatment options are for "
         "their myeloma (e.g. 'Using my profile, what are the best treatment options for my myeloma?'), "
-        "combine TWO sources: their 16 yes/no profile answers AND the source excerpts. "
+        "combine TWO sources: their 21 yes/no profile answers AND the source excerpts. "
         "Keep the whole reply under 120 words — one opening line, at most 3 bullets, one closing "
         "line, one question:\n"
         "   - One warm opening line.\n"
@@ -655,7 +664,7 @@ def sign_in(user_id_raw, email_raw, uid_attempts):
 
     if chat_display and convo:
         # A conversation saved before the opening summary existed has none, so
-        # add it here: every chat should begin with the 16 questions.
+        # add it here: every chat should begin with the 21 questions.
         if (any(a is not None for a in answers)
                 and not chat_display[0]["content"].startswith(ANSWERS_SUMMARY_HEADING)):
             chat_display = [{"role": "assistant",
@@ -702,7 +711,7 @@ def start_chat(api_key, email, can_save, revision, chat_display, convo,
     answers = [v if v in ("Yes", "No") else None for v in radio_values]
     if any(v is None for v in answers):
         missing = [i + 1 for i, v in enumerate(answers) if v is None]
-        gr.Warning(f"Please answer all 16 questions. Missing: {missing}")
+        gr.Warning(f"Please answer all 21 questions. Missing: {missing}")
         # Nothing has been written yet, so a rejected submission must change
         # nothing: hand the existing conversation state straight back.
         return (gr.update(), chat_display, convo, n_followups, revision,
@@ -734,7 +743,7 @@ def start_chat(api_key, email, can_save, revision, chat_display, convo,
     flag_text = "\n".join(f"- {f}" for f in flags) if flags else "- (No obvious contradictions; explore their highest-stakes priorities.)"
 
     seed = (
-        "Here is the patient's completed profile (16 yes/no answers):\n\n"
+        "Here is the patient's completed profile (21 yes/no answers):\n\n"
         f"{profile}\n\n"
         "FLAGGED TENSIONS / PRIORITIES TO EXPLORE:\n"
         f"{flag_text}\n\n"
@@ -1074,7 +1083,7 @@ with gr.Blocks(title="MyeAI (Myeloma AI)", css=CSS,
         email_btn = gr.Button("Continue", variant="primary")
 
     with gr.Group(visible=False) as intake_panel:
-        gr.Markdown("**Answer all 16 questions, then click Start Follow-up.**")
+        gr.Markdown("**Answer all 21 questions, then click Start Follow-up.**")
         radios = []
         for i, q in enumerate(QUESTIONS):
             with gr.Row(elem_classes="q-card"):
@@ -1089,7 +1098,7 @@ with gr.Blocks(title="MyeAI (Myeloma AI)", css=CSS,
                              # paste elsewhere (e.g. a note for their care team).
                              show_copy_button=True,
                              # Without this, consecutive assistant messages (the
-                             # 16-answer summary + the greeting) merge into one
+                             # 21-answer summary + the greeting) merge into one
                              # bubble sharing one copy button, so the summary
                              # could not be copied on its own.
                              group_consecutive_messages=False)
@@ -1107,7 +1116,7 @@ with gr.Blocks(title="MyeAI (Myeloma AI)", css=CSS,
             gr.Markdown(
                 "**Are you sure you want to start over?**\n\n"
                 "This erases your current chat history and begins a new session. "
-                "You will answer the 16 questions again."
+                "You will answer the 21 questions again."
             )
             with gr.Row():
                 confirm_reset_btn = gr.Button("Yes, erase and start over",
@@ -1132,7 +1141,7 @@ with gr.Blocks(title="MyeAI (Myeloma AI)", css=CSS,
     # Save the questionnaire as it is filled in, so a half-finished intake
     # survives a closed tab.
     # `.input` rather than `.change`: fires only on a real click, so restoring
-    # or clearing the form does not stampede 16 writes back at Supabase.
+    # or clearing the form does not stampede 21 writes back at Supabase.
     for r in radios:
         r.input(
             save_partial_answers,