fix: imporve responses flow

app/graph.py

@@ -2,7 +2,7 @@ from typing import Optional, TypedDict, Annotated
 from langgraph.graph import StateGraph, START, END
 from langgraph.checkpoint.memory import MemorySaver
 import os
-from app.llm import get_llm
+import re
 
 _MOCK = lambda: os.environ.get("MOCK_LLM", "true").lower() == "true"
 
@@ -18,11 +18,11 @@ Rules:
 
 
 def _ask(prompt: str) -> str:
+    from app.llm import get_llm
     llm = get_llm()
     try:
         return llm.ask(prompt, system=SYSTEM_PROMPT)
     except TypeError:
-        # fallback if system param not supported
         return llm.ask(prompt)
 
 
@@ -46,14 +46,15 @@ class IntakeState(TypedDict):
 
 HPI_FIELDS = ["onset", "location", "duration", "character", "severity", "aggravating", "relieving"]
 
+# Questions are templated — {cc} will be replaced with chief complaint
 HPI_QUESTIONS = {
-    "onset": "When did your symptoms first start?",
-    "location": "Where exactly do you feel the pain or discomfort?",
-    "duration": "How long does each episode last? Is it constant or intermittent?",
-    "character": "Can you describe what the pain feels like?",
-    "severity": "On a scale of 1 to 10, how severe is your pain?",
-    "aggravating": "What makes your symptoms worse?",
-    "relieving": "What helps relieve your symptoms?"
+    "onset": "When did {cc} start?",
+    "location": "Where exactly do you feel {cc}?",
+    "duration": "Is {cc} constant or does it come and go? How long does each episode last?",
+    "character": "How would you describe {cc} — sharp, dull, pressure, burning?",
+    "severity": "On a 1–10 scale, how severe is your {cc} right now?",
+    "aggravating": "Does anything make {cc} worse, like activity or certain foods?",
+    "relieving": "What helps relieve your {cc}?"
 }
 
 HPI_FIELD_CONTEXT = {
@@ -81,37 +82,74 @@ CC_KEYWORDS_TO_ROS = {
 
 DEFAULT_ROS = ["constitutional", "cardiac", "respiratory"]
 
+ROS_SYSTEM_QUESTIONS = {
+    "cardiac": "Any palpitations, fluttering, or swelling in your legs or ankles?",
+    "respiratory": "Any shortness of breath, wheezing, or cough?",
+    "gi": "Any nausea, vomiting, heartburn, or abdominal pain?",
+    "neuro": "Any headaches, dizziness, numbness, or vision changes?",
+    "ent": "Any ear pain, sore throat, or sinus pressure?",
+    "vision": "Any blurry vision, double vision, or eye pain?",
+    "constitutional": "Any fever, chills, unexplained weight loss, or fatigue?",
+}
+
 
 def get_relevant_ros_systems(cc: str) -> list[str]:
     cc_lower = cc.lower()
+    seen = []
     for keyword, systems in CC_KEYWORDS_TO_ROS.items():
         if keyword in cc_lower:
-            return systems
-    return DEFAULT_ROS
+            for s in systems:
+                if s not in seen:
+                    seen.append(s)
+    return seen if seen else DEFAULT_ROS
 
 
-import re
+def _fmt_question(field: str, cc: str) -> str:
+    """Format an HPI question, injecting the chief complaint naturally."""
+    q = HPI_QUESTIONS[field]
+    cc_short = cc.split()[0:4]  # first few words of complaint
+    cc_str = " ".join(cc_short).lower() if cc_short else "this"
+    return q.format(cc=cc_str)
 
 
 def extract_hpi_value(answer: str, field: str) -> str:
     answer = answer.strip()
     if field == "severity":
-        match = re.search(r'(\d{1,2})\s*(?:out of|/)?\s*10', answer, re.IGNORECASE)
+        match = re.search(r'(\d{1,2})\s*(?:out of|/|over)?\s*10', answer, re.IGNORECASE)
         if match:
             return f"{match.group(1)}/10"
+        # also handle bare numbers 1-10
+        match2 = re.search(r'\b([1-9]|10)\b', answer)
+        if match2:
+            return f"{match2.group(1)}/10"
     return answer
 
 
 def _is_vague_answer(answer: str) -> bool:
-    vague_phrases = ["i don't know", "not sure", "dont know", "idk", "maybe", "i guess"]
-    answer_lower = answer.lower()
-    return any(phrase in answer_lower for phrase in vague_phrases)
+    vague_phrases = ["i don't know", "not sure", "dont know", "idk", "maybe", "i guess", "not really", "not sure"]
+    return any(phrase in answer.lower() for phrase in vague_phrases)
+
+
+def _parse_ros_answer(answer: str) -> list[str]:
+    """
+    Parse a free-text ROS answer into a list of individual findings.
+    Handles comma-separated, 'and'-joined, and 'no X' style negative findings.
+    """
+    # Split on commas, semicolons, and 'and'
+    parts = re.split(r'[,;]|\band\b', answer, flags=re.IGNORECASE)
+    findings = []
+    for part in parts:
+        part = part.strip()
+        if part:
+            findings.append(part)
+    return findings if findings else [answer.strip()]
 
 
 # -------------------- NODES --------------------
 
 GREETINGS = {"hello", "hi", "hey", "start", "begin", "ok", "okay", "yes", "sure"}
 
+
 def intake_node(state: IntakeState) -> dict:
     messages = state.get("messages", [])
     last_idx = state.get("last_processed_message_index", 0)
@@ -139,7 +177,7 @@ def intake_node(state: IntakeState) -> dict:
 
             cc = content
             if _MOCK():
-                reply = f"I understand you're experiencing {cc}. Let me ask a few questions."
+                reply = f"Got it — {cc}. I'll ask a few quick questions to document your visit."
             else:
                 reply = _ask(
                     f"Patient's chief complaint is: '{cc}'. "
@@ -178,7 +216,7 @@ def hpi_node(state: IntakeState) -> dict:
 
     if next_field is None:
         return {
-            "messages": [{"role": "assistant", "content": "Now I’ll ask about other symptoms."}],
+            "messages": [{"role": "assistant", "content": "Thank you. Now I'll ask about a few other symptoms."}],
             "current_node": "ros",
             "last_processed_message_index": len(messages),
             "vague_retry_field": None,
@@ -196,7 +234,7 @@ def hpi_node(state: IntakeState) -> dict:
                 field_context = HPI_FIELD_CONTEXT[next_field]
 
                 if _MOCK():
-                    reply = f"Please be more specific about {field_context}."
+                    reply = f"Could you be more specific? I need to know {field_context}."
                 else:
                     reply = _ask(
                         f"Patient response about {field_context} was vague. "
@@ -217,7 +255,7 @@ def hpi_node(state: IntakeState) -> dict:
                 next_field = HPI_FIELDS[next_idx + 1]
 
                 if _MOCK():
-                    reply = HPI_QUESTIONS[next_field]
+                    reply = _fmt_question(next_field, cc)
                 else:
                     reply = _ask(
                         f"Complaint: {cc}. Known info: {hpi}. "
@@ -233,7 +271,7 @@ def hpi_node(state: IntakeState) -> dict:
                 }
 
             return {
-                "messages": [{"role": "assistant", "content": "Now I’ll ask about other symptoms."}],
+                "messages": [{"role": "assistant", "content": "Thank you. Now I'll ask about a few other symptoms."}],
                 "hpi": hpi,
                 "current_node": "ros",
                 "last_processed_message_index": len(messages),
@@ -241,7 +279,7 @@ def hpi_node(state: IntakeState) -> dict:
             }
 
     if _MOCK():
-        reply = HPI_QUESTIONS[next_field]
+        reply = _fmt_question(next_field, cc)
     else:
         reply = _ask(
             f"Complaint: {cc}. Known info: {hpi}. "
@@ -268,7 +306,7 @@ def ros_node(state: IntakeState) -> dict:
 
     if current_idx >= len(ros_systems):
         return {
-            "messages": [{"role": "assistant", "content": "I have enough information."}],
+            "messages": [{"role": "assistant", "content": "Thank you — I have everything I need."}],
             "current_node": "brief_generator",
             "last_processed_message_index": len(messages),
         }
@@ -277,12 +315,12 @@ def ros_node(state: IntakeState) -> dict:
 
     if has_new_user_msg and pending:
         answer = messages[-1]["content"]
-        ros[pending] = [f.strip() for f in answer.split(",")]
+        ros[pending] = _parse_ros_answer(answer)
 
     next_system = ros_systems[current_idx]
 
     if _MOCK():
-        reply = f"Any {next_system} symptoms? Mention present and absent."
+        reply = ROS_SYSTEM_QUESTIONS.get(next_system, f"Any {next_system} symptoms? Mention present and absent.")
     else:
         reply = _ask(
             f"Ask about {next_system} symptoms. One short question. "
@@ -306,18 +344,60 @@ from datetime import datetime, timezone
 from app.schemas import HPI as HPIModel, ClinicalBrief as ClinicalBriefModel
 
 
+def _clean_hpi_value(field: str, raw: str) -> str:
+    """
+    Convert a raw patient answer into a clean clinical phrase.
+    Removes filler words and informal language.
+    """
+    raw = raw.strip()
+
+    # Remove filler starters
+    fillers = [
+        r'^(yeah|yes|no|well|so|like|um|uh|i mean|i guess),?\s*',
+        r'^(it\'?s?\s+)',
+        r'^(the\s+)',
+    ]
+    for pattern in fillers:
+        raw = re.sub(pattern, '', raw, flags=re.IGNORECASE).strip()
+
+    if not raw:
+        return "not specified"
+
+    # Capitalize first letter
+    return raw[0].upper() + raw[1:]
+
+
 def brief_generator_node(state: IntakeState) -> dict:
-    hpi_obj = HPIModel(**{f: state.get("hpi", {}).get(f) or "not specified" for f in HPI_FIELDS})
+    raw_hpi = state.get("hpi", {})
+
+    # Clean each HPI field
+    cleaned_hpi = {f: _clean_hpi_value(f, raw_hpi.get(f) or "not specified") for f in HPI_FIELDS}
+
+    hpi_obj = HPIModel(**cleaned_hpi)
+
+    # Clean ROS — ensure each system has a proper list of findings
+    raw_ros = state.get("ros", {})
+    cleaned_ros: dict[str, list[str]] = {}
+    for system, findings in raw_ros.items():
+        clean_findings = []
+        for f in findings:
+            f = f.strip()
+            if f:
+                # Capitalize
+                f = f[0].upper() + f[1:]
+                clean_findings.append(f)
+        if clean_findings:
+            cleaned_ros[system] = clean_findings
 
     brief = ClinicalBriefModel(
         chief_complaint=state.get("chief_complaint", ""),
         hpi=hpi_obj,
-        ros=state.get("ros", {}),
+        ros=cleaned_ros,
         generated_at=datetime.now(timezone.utc).isoformat().replace("+00:00", "Z"),
     )
 
     return {
-        "messages": [{"role": "assistant", "content": "Intake complete. Here is your summary."}],
+        "messages": [{"role": "assistant", "content": "Intake complete. Your clinical summary is ready."}],
         "current_node": "done",
         "clinical_brief": brief.model_dump(),
     }

app/static/index.html

@@ -406,11 +406,12 @@
     }
 
     .brief-header {
-      padding: 16px 20px;
+      padding: 12px 20px;
       border-bottom: 1px solid var(--border);
       display: flex;
       align-items: center;
       justify-content: space-between;
+      gap: 8px;
     }
 
     .brief-header h2 {
@@ -421,6 +422,12 @@
       text-transform: uppercase;
     }
 
+    .brief-header-right {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+    }
+
     .brief-badge {
       font-size: 11px;
       font-weight: 600;
@@ -435,6 +442,23 @@
       color: var(--success);
     }
 
+    .icon-btn {
+      width: 28px;
+      height: 28px;
+      border: 1px solid var(--border);
+      border-radius: var(--radius-sm);
+      background: var(--surface);
+      color: var(--text-secondary);
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: all 0.2s;
+      flex-shrink: 0;
+    }
+    .icon-btn:hover { border-color: var(--accent); color: var(--accent); background: var(--accent-light); }
+    .icon-btn svg { width: 13px; height: 13px; stroke: currentColor; fill: none; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; }
+
     .brief-content {
       flex: 1;
       overflow-y: auto;
@@ -664,7 +688,15 @@
   <div class="brief-panel">
     <div class="brief-header">
       <h2>Clinical Brief</h2>
-      <span class="brief-badge" id="briefBadge">Pending</span>
+      <div class="brief-header-right">
+        <button class="icon-btn" id="copyBtn" title="Copy to clipboard" style="display:none">
+          <svg viewBox="0 0 24 24"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
+        </button>
+        <button class="icon-btn" id="printBtn" title="Print" style="display:none">
+          <svg viewBox="0 0 24 24"><polyline points="6 9 6 2 18 2 18 9"/><path d="M6 18H4a2 2 0 0 1-2-2v-5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2h-2"/><rect x="6" y="14" width="12" height="8"/></svg>
+        </button>
+        <span class="brief-badge" id="briefBadge">Pending</span>
+      </div>
     </div>
     <div class="brief-content" id="briefContent">
       <div class="brief-empty">
@@ -769,12 +801,19 @@
     if (el) el.remove();
   }
 
+  let lastBrief = null;
+
   function renderBrief(brief) {
-    const hpiLabels = {
-      onset: 'Onset', location: 'Location', duration: 'Duration',
-      character: 'Character', severity: 'Severity',
-      aggravating: 'Aggravating', relieving: 'Relieving'
-    };
+    lastBrief = brief;
+    const hpiLabels = [
+      ['onset', 'Onset'],
+      ['location', 'Location'],
+      ['duration', 'Duration'],
+      ['character', 'Character'],
+      ['severity', 'Severity'],
+      ['aggravating', 'Aggravating'],
+      ['relieving', 'Relieving'],
+    ];
 
     let html = `
       <div class="brief-section">
@@ -786,12 +825,13 @@
         <div class="hpi-grid">
     `;
 
-    for (const [key, label] of Object.entries(hpiLabels)) {
+    for (const [key, label] of hpiLabels) {
       const val = brief.hpi[key] || 'Not specified';
+      const isMissing = !brief.hpi[key] || brief.hpi[key] === 'Not specified';
       html += `
         <div class="hpi-row">
           <div class="hpi-key">${label}</div>
-          <div class="hpi-val">${escHtml(val)}</div>
+          <div class="hpi-val" style="${isMissing ? 'color:var(--text-muted);font-style:italic' : ''}">${escHtml(val)}</div>
         </div>
       `;
     }
@@ -801,9 +841,11 @@
     if (brief.ros && Object.keys(brief.ros).length > 0) {
       html += `<div class="brief-section"><div class="brief-section-title">Review of Systems</div>`;
       for (const [system, findings] of Object.entries(brief.ros)) {
-        html += `<div class="ros-system"><div class="ros-system-name">${escHtml(system)}</div><div class="ros-findings">`;
+        const label = system.charAt(0).toUpperCase() + system.slice(1);
+        html += `<div class="ros-system"><div class="ros-system-name">${escHtml(label)}</div><div class="ros-findings">`;
         findings.forEach(f => {
-          const isNeg = f.toLowerCase().startsWith('no ') || f.toLowerCase().includes('none');
+          const fl = f.toLowerCase();
+          const isNeg = fl.startsWith('no ') || fl.includes('none') || fl.includes('absent') || fl.includes('denied') || fl.includes('no swelling') || fl.includes('negative');
           html += `<span class="finding-tag ${isNeg ? 'negative' : 'positive'}">${escHtml(f)}</span>`;
         });
         html += `</div></div>`;
@@ -817,6 +859,28 @@
     briefContent.innerHTML = html;
     briefBadge.textContent = 'Complete';
     briefBadge.className = 'brief-badge complete';
+    document.getElementById('copyBtn').style.display = 'flex';
+    document.getElementById('printBtn').style.display = 'flex';
+  }
+
+  function briefToPlainText(brief) {
+    const hpiLabels = ['onset','location','duration','character','severity','aggravating','relieving'];
+    let txt = `CLINICAL BRIEF\n${'='.repeat(40)}\n`;
+    txt += `Chief Complaint: ${brief.chief_complaint}\n\n`;
+    txt += `History of Present Illness\n${'-'.repeat(30)}\n`;
+    for (const key of hpiLabels) {
+      const val = brief.hpi[key] || 'Not specified';
+      txt += `${key.charAt(0).toUpperCase()+key.slice(1).padEnd(14)}: ${val}\n`;
+    }
+    if (brief.ros && Object.keys(brief.ros).length > 0) {
+      txt += `\nReview of Systems\n${'-'.repeat(30)}\n`;
+      for (const [sys, findings] of Object.entries(brief.ros)) {
+        txt += `${sys.charAt(0).toUpperCase()+sys.slice(1)}: ${findings.join(', ')}\n`;
+      }
+    }
+    const ts = brief.generated_at ? new Date(brief.generated_at).toLocaleString() : '';
+    if (ts) txt += `\nGenerated: ${ts}`;
+    return txt;
   }
 
   function escHtml(str) {
@@ -902,6 +966,25 @@
     }
   }
 
+  document.getElementById('copyBtn').addEventListener('click', () => {
+    if (!lastBrief) return;
+    const txt = briefToPlainText(lastBrief);
+    navigator.clipboard.writeText(txt).then(() => {
+      const btn = document.getElementById('copyBtn');
+      btn.title = 'Copied!';
+      setTimeout(() => { btn.title = 'Copy to clipboard'; }, 2000);
+    });
+  });
+
+  document.getElementById('printBtn').addEventListener('click', () => {
+    if (!lastBrief) return;
+    const txt = briefToPlainText(lastBrief);
+    const w = window.open('', '_blank');
+    w.document.write(`<pre style="font-family:monospace;padding:24px;max-width:700px;margin:auto">${txt}</pre>`);
+    w.document.close();
+    w.print();
+  });
+
   sendBtn.addEventListener('click', () => {
     const text = inputEl.value.trim();
     if (text) { inputEl.value = ''; autoResize(); sendMessage(text); }

tests/test_e2e.py

@@ -35,17 +35,17 @@ async def test_full_intake_flow(client):
     assert data["state"] in ["intake", "hpi"]
 
     responses = [
-        "I have chest pain since this morning",
-        "It started about 3 hours ago",
-        "In the center of my chest",
-        "It has been constant",
-        "It feels like pressure",
-        "About a 7 out of 10",
-        "It gets worse when I walk",
-        "Resting helps a little",
-        "palpitations present, no syncope",
-        "mild shortness of breath, no cough",
-        "done",
+        "I have chest pain since this morning",   # CC (intake)
+        "It started about 3 hours ago",            # onset
+        "In the center of my chest",               # location
+        "It has been constant for an hour",        # duration
+        "It feels like pressure",                  # character
+        "About a 7 out of 10",                     # severity
+        "It gets worse when I walk",               # aggravating
+        "Resting helps a little",                  # relieving
+        "palpitations present, no syncope",        # cardiac ROS
+        "mild shortness of breath, no cough",      # respiratory ROS
+        "no nausea or vomiting",                   # gi ROS
     ]
 
     final_data = None
@@ -67,21 +67,24 @@ async def test_full_intake_flow(client):
 
 @pytest.mark.asyncio(loop_scope="function")
 async def test_hpi_reprompt(client):
+    """Vague answers (I don't know) should trigger a re-prompt."""
     session_id = "test_vague"
 
     await client.post("/chat", json={"session_id": session_id, "message": "hello"})
     await client.post("/chat", json={"session_id": session_id, "message": "I have chest pain"})
 
-    response = await client.post("/chat", json={"session_id": session_id, "message": "When did it start?"})
-
+    # First HPI question is about onset
     vague_response = await client.post("/chat", json={"session_id": session_id, "message": "I don't know"})
     assert vague_response.status_code == 200
     data = vague_response.json()
-    assert "specific" in data["reply"].lower() or "when" in data["reply"].lower()
+    reply_lower = data["reply"].lower()
+    # Should ask again — should mention specificity or the field context
+    assert "specific" in reply_lower or "when" in reply_lower or "start" in reply_lower
 
 
 @pytest.mark.asyncio(loop_scope="function")
 async def test_ros_scoping(client):
+    """For chest pain, ROS should include cardiac and respiratory systems."""
     session_id = "test_chest_pain"
 
     await client.post("/chat", json={"session_id": session_id, "message": "hello"})
@@ -100,12 +103,12 @@ async def test_ros_scoping(client):
     for resp in hpi_responses:
         await client.post("/chat", json={"session_id": session_id, "message": resp})
 
-    ros_response = await client.post("/chat", json={"session_id": session_id, "message": "ready for ROS"})
-    ros_data = ros_response.json()
-
-    await client.post("/chat", json={"session_id": session_id, "message": "cardiac:palpitations,no syncope|respiratory:shortness of breath,no cough"})
-
-    final_response = await client.post("/chat", json={"session_id": session_id, "message": "done"})
+    # Now in ROS — answer cardiac system
+    await client.post("/chat", json={"session_id": session_id, "message": "palpitations, no syncope"})
+    # respiratory
+    await client.post("/chat", json={"session_id": session_id, "message": "mild shortness of breath, no cough"})
+    # gi
+    final_response = await client.post("/chat", json={"session_id": session_id, "message": "no nausea"})
     final_data = final_response.json()
 
     if final_data.get("brief"):
@@ -115,6 +118,7 @@ async def test_ros_scoping(client):
 
 @pytest.mark.asyncio(loop_scope="function")
 async def test_brief_structure(client):
+    """Brief should have all 7 HPI fields, chief_complaint, ros, and generated_at."""
     session_id = "test_brief"
 
     messages = [
@@ -127,9 +131,12 @@ async def test_brief_structure(client):
         "7 out of 10",
         "Walking worsens it",
         "Resting helps",
-        "cardiac:palpitations,no syncope|respiratory:shortness of breath,no cough",
+        "palpitations present, no syncope",
+        "shortness of breath, no cough",
+        "no nausea or vomiting",
     ]
 
+    response = None
     for msg in messages:
         response = await client.post("/chat", json={"session_id": session_id, "message": msg})
         assert response.status_code == 200
@@ -149,3 +156,38 @@ async def test_brief_structure(client):
         assert validated.hpi.severity
         assert validated.hpi.aggravating
         assert validated.hpi.relieving
+        assert validated.generated_at
+
+
+@pytest.mark.asyncio(loop_scope="function")
+async def test_brief_cleaning(client):
+    """Brief generator should strip informal filler words from patient answers."""
+    session_id = "test_cleaning"
+
+    messages = [
+        "hello",
+        "I have chest pain",
+        "yeah like since yesterday evening",   # filler "yeah like"
+        "like in my chest area",               # filler "like"
+        "Constant",
+        "um tight and squeezing",              # filler "um"
+        "7 out of 10",
+        "yeah walking makes it worse",         # filler "yeah"
+        "Resting helps",
+        "palpitations, no syncope",
+        "mild shortness of breath",
+        "no nausea",
+    ]
+
+    response = None
+    for msg in messages:
+        response = await client.post("/chat", json={"session_id": session_id, "message": msg})
+        assert response.status_code == 200
+
+    final_data = response.json()
+    if final_data.get("brief"):
+        hpi = final_data["brief"]["hpi"]
+        # "yeah like since yesterday evening" → should not start with "yeah"
+        if hpi.get("onset"):
+            assert not hpi["onset"].lower().startswith("yeah"), \
+                f"Filler not cleaned from onset: {hpi['onset']}"