Update app.py

app.py

@@ -55,27 +55,6 @@ yes_no_labels = ['no','yes']
 yes_no_other_labels = ['no','yes','other']
 default_labels = agreement_labels
 
-MAX_RUPTURE_MARKERS = 8  # 1 initial + up to 7 extra
-RUPTURE_LINE_INPUT_TYPE = "number"  # or "text" if your line numbers aren't pure ints
-
-rupture_choices = ["",
-                   "Denial",
-                   "Minimal response",
-                   "Abstract communication",
-                   "Avoidant storytelling and/or topic-shifting",
-                   "Deferential / appeasing behavior",
-                   "Content/affect split (i.e. talking content vs emotional tone mismatch)",
-                   "Self-criticism and/or hopelessness",
-                   "Complaints or concerns about the therapist",
-                   "Patient rejects therapist intervention",
-                   "Complaints/concerns about the activities of therapy",
-                   "Complaints/concerns about the parameters of therapy (e.g. scheduling, rules)",
-                   "Complaints/concerns about progress in therapy",
-                   "Patient defends self against therapist",
-                   "Efforts to control or pressure the therapist",
-                    "Other"]
-          
-default_choices = rupture_choices
 
 consent_text = '''
 ## Consent Form
@@ -134,14 +113,6 @@ fields1: List[Field] = [
                     other_params={'labels': mentioned_y_n}, mandatory=True),
     ]),
 
-#    Field(type="container", title="#### Rupture Markers", children=[
-#        Field(type="expander", title="**Overview of rupture markers** *(expand)*", children=[
-#            Field(type="markdown", title="", other_params={"path": "rupture_marker_overview.md"}),
-#        ]),
-#        Field(name="rupture_marker", type="rupture_markers",
-#          title="Select rupture markers noted in the session, include line numbers where rupture is found.", mandatory=False),
-#    ]),
-
     Field(type="container", title="#### True-To-Patient-Prompt Features", children=[
         Field(type="expander", title="**Patient Role Description:** *(expand)*", children=[
         Field(name="role_name", type="input_col", title=""),
@@ -396,55 +367,6 @@ def render_dialogue(md_path: str,
     st_html(html_doc, height=height_px + (16 if show_border else 0), scrolling=False)
 
 
-def render_rupture_markers_widget(index: int, choices: list[str]):
-    """Dynamic list of (rupture_marker_i, line_a_i, line_b_i) with Add/Remove.
-       Works inside a st.form by using form_submit_button instead of callbacks."""
-    count_key = f"rupture_count_{index}"
-    if count_key not in st.session_state:
-        st.session_state[count_key] = 1
-
-    count = st.session_state[count_key]
-
-    st.markdown("**What rupture markers are found?** *(one per row; max 8)*")
-
-    for i in range(1, count + 1):
-        col1, col2, col3 = st.columns([3, 1, 1])
-
-        marker_key = f"rupture_marker_{i}_{index}"
-        a_key = f"rupture_marker_{i}_line_a_{index}"
-        b_key = f"rupture_marker_{i}_line_b_{index}"
-
-        with col1:
-            current = st.session_state.get(marker_key, "")
-            if marker_key in st.session_state:
-                st.selectbox(f"Rupture marker {i}", options=choices, key=marker_key)
-            else:
-                default_idx = choices.index(current) if current in choices else 0
-                st.selectbox(f"Rupture marker {i}", options=choices, key=marker_key, index=default_idx)
-        with col2:
-            if RUPTURE_LINE_INPUT_TYPE == "number":
-                st.number_input("Lines: from", min_value=0, step=1, key=a_key)
-            else:
-                st.text_input("Lines: from", key=a_key, value=st.session_state.get(a_key, ""))
-        with col3:
-            if RUPTURE_LINE_INPUT_TYPE == "number":
-                st.number_input("Lines: to", min_value=0, step=1, key=b_key)
-            else:
-                st.text_input("Lines: to", key=b_key, value=st.session_state.get(b_key, ""))
-
-        st.markdown("---")
-
-    a_col, b_col = st.columns([1, 1])
-    with a_col:
-        if st.button("➕ Add another rupture marker", disabled=(count >= MAX_RUPTURE_MARKERS)):
-            st.session_state[count_key] = min(MAX_RUPTURE_MARKERS, count + 1)
-            st.rerun()
-    with b_col:
-        if st.button("➖ Remove last", disabled=(count <= 1)):
-            st.session_state[count_key] = max(1, count - 1)
-            st.rerun()
-
-    st.caption(f"{st.session_state[count_key]}/{MAX_RUPTURE_MARKERS} markers")
 
 def _get_value_for_field(f: Field, index: int):
     """Return the session value for input fields or None."""
@@ -457,41 +379,6 @@ def _is_default_value(f: Field, val):
     """Check if current value equals the default for this widget type."""
     return val == INPUT_FIELD_DEFAULT_VALUES.get(f.type)
 
-def prime_rupture_markers_from_saved(index: int, data_collected: dict | None):
-    """
-    Copy saved JSON values (rupture_marker_1, *_line_a, *_line_b) into
-    st.session_state keys used by the widget (…_{index}), and set the count.
-    Runs once per index to avoid clobbering user edits on reruns.
-    """
-    if not data_collected:
-        return
-
-    primed_flag = f"rupture_primed_{index}"
-    if st.session_state.get(primed_flag):
-        return  # already restored for this page
-
-    slots = []
-    for i in range(1, MAX_RUPTURE_MARKERS + 1):
-        m = data_collected.get(f"rupture_marker_{i}")
-        a = data_collected.get(f"rupture_marker_{i}_line_a")
-        b = data_collected.get(f"rupture_marker_{i}_line_b")
-        if any(v is not None for v in (m, a, b)):
-            # widget's selectbox uses "" for "no selection"
-            slots.append(((m or ""), a, b))
-
-    if not slots:
-        return
-
-    # set widget count (at least 1, capped to MAX)
-    count_key = f"rupture_count_{index}"
-    st.session_state[count_key] = min(MAX_RUPTURE_MARKERS, max(1, len(slots)))
-
-    for i, (m, a, b) in enumerate(slots, start=1):
-        st.session_state[f"rupture_marker_{i}_{index}"] = m if m in rupture_choices else (m or "")
-        st.session_state[f"rupture_marker_{i}_line_a_{index}"] = a
-        st.session_state[f"rupture_marker_{i}_line_b_{index}"] = b
-
-    st.session_state[primed_flag] = True
 
 def validate_current_page(fields: List[Field], index: int) -> bool:
     """
@@ -638,10 +525,6 @@ def show_field(f: Field, index: int, data_collected):
             case 'skip_checkbox':
                 st.checkbox(f.title, key=f.name, value=False)
 
-            case 'rupture_markers':
-                prime_rupture_markers_from_saved(index, data_collected)
-                render_rupture_markers_widget(index, rupture_choices)
-
         return
 
     else:
@@ -812,40 +695,6 @@ def prep_and_save_data(index, skip_sample, completed: bool):
         key = f.name + str(index)
         val = st.session_state.get(key, INPUT_FIELD_DEFAULT_VALUES[f.type])
         payload[f.name] = val
-        
-    # normalize rupture markers -> always write 8 slots
-    count_key = f"rupture_count_{index}"
-    count = st.session_state.get(count_key, 1)
-    for i in range(1, MAX_RUPTURE_MARKERS + 1):
-        m_key = f"rupture_marker_{i}_{index}"
-        a_key = f"rupture_marker_{i}_line_a_{index}"
-        b_key = f"rupture_marker_{i}_line_b_{index}"
-
-        # export names WITHOUT the trailing _{index}, so your JSON uses a stable schema:
-        out_m = f"rupture_marker_{i}"
-        out_a = f"rupture_marker_{i}_line_a"
-        out_b = f"rupture_marker_{i}_line_b"
-
-        if i <= count:
-            marker_val = st.session_state.get(m_key)
-            line_a_val = st.session_state.get(a_key)
-            line_b_val = st.session_state.get(b_key)
-
-            # Basic sanity: if numbers, coerce order (optional)
-            if RUPTURE_LINE_INPUT_TYPE == "number":
-                try:
-                    if line_a_val is not None and line_b_val is not None and line_a_val > line_b_val:
-                        line_a_val, line_b_val = line_b_val, line_a_val
-                except Exception:
-                    pass
-
-            payload[out_m] = marker_val if marker_val not in ("", None) else None
-            payload[out_a] = line_a_val if line_a_val not in ("", None) else None
-            payload[out_b] = line_b_val if line_b_val not in ("", None) else None
-        else:
-            payload[out_m] = None
-            payload[out_a] = None
-            payload[out_b] = None
 
     save_data(payload)