Update app.py

app.py

@@ -53,26 +53,26 @@ yes_no_labels = ['no','yes']
 yes_no_other_labels = ['no','yes','other']
 default_labels = agreement_labels
 
-function_choices = ['Broadening Discussion', 
-                    'Improving Comment Quality', 
-                    'Content Correction', 
-                    'Keeping Discussion on Topic', 
-                    'Organizing Discussion', 
-                    'Policing', 
-                    'Resolving Site Use Issues', 
-                    'Social Functions', 
-                    'None',
-                    'Other']
-
-rupture_choices = ["Shutting down",
-                   "Avoiding",
-                   "Masking aspects of one's experience",
-                   "Complaining/critisizing",
-                   "Pushing back",
-                   "Controlling/pressuring",
+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 = function_choices
+default_choices = rupture_choices
 
 consent_text = '''
 ## Consent Form
@@ -127,12 +127,14 @@ fields: List[Field] = [
                    title="Level of priority", other_params={'labels': priority_labels}, mandatory=True),
     ]),
 
-    Field(type="container", title="**Rupture-Specific Properties**", children=[
-        Field(name="rupture_function", type="multiselect",
-                     title="What type of rupture markers are found? *(Multiple selection possible)*", 
-                     other_params={'choices': rupture_choices}, mandatory=True, following_mandatory_values=['Other (please specify)']),
-        Field(name="rupture_function_other", type="text", title="*If Other, please specify:*", mandatory=False),
-        Field(name="rupture_line", type="text", title="What lines demonstrate the rupture markers you notice?", mandatory=False),
+    Field(type="container", title="**Rupture Markers**", children=[
+        Field(name="rupture_markers", type="rupture_markers",
+          title="Select rupture markers noted in the session, include line numbers where rupture is found.", mandatory=False),
+    #    Field(name="rupture_marker", type="multiselect",
+    #                 title="What type of rupture markers are found? *(Select only one)*", 
+    #                 other_params={'choices': rupture_choices}, mandatory=True, following_mandatory_values=['Other (please specify)']),
+    #    Field(name="rupture_marker", type="text", title="What lines demonstrate the rupture markers you notice?", mandatory=False),
+    #    Field(name="rupture_marker_other", type="text", title="*If Other, please specify:*", mandatory=False),
     ]),
 
     Field(type="container", title="**True-To-Patient-Prompt Properties**", children=[
@@ -332,6 +334,69 @@ 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."""
+    count_key = f"rupture_count_{index}"
+    if count_key not in st.session_state:
+        st.session_state[count_key] = 1  # start with one block
+
+    count = st.session_state[count_key]
+
+    st.markdown("**What rupture markers are found?** *(one per row; max 8)*")
+
+    # render the i=1..count rows
+    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:
+            st.selectbox(
+                f"Rupture marker {i}",
+                options=choices,
+                key=marker_key,
+                index=(choices.index(st.session_state.get(marker_key))
+                       if st.session_state.get(marker_key) in choices else 0)
+                if st.session_state.get(marker_key) is not None else 0
+            )
+
+        # line inputs (number or text)
+        with col2:
+            if RUPTURE_LINE_INPUT_TYPE == "number":
+                st.number_input(f"Lines: {i} – from", min_value=1, step=1, key=a_key)
+            else:
+                st.text_input(f"Lines: {i} – from", key=a_key, value=st.session_state.get(a_key, ""))
+
+        with col3:
+            if RUPTURE_LINE_INPUT_TYPE == "number":
+                st.number_input(f"Lines: {i} – to", min_value=1, step=1, key=b_key)
+            else:
+                st.text_input(f"Lines: {i} – to", key=b_key, value=st.session_state.get(b_key, ""))
+
+        st.markdown("---")
+
+    # add/remove buttons
+    a_col, b_col = st.columns([1, 1])
+    with a_col:
+        st.button(
+            "➕ Add another rupture marker",
+            key=f"add_rup_{index}",
+            disabled=(count >= MAX_RUPTURE_MARKERS),
+            on_click=lambda: st.session_state.__setitem__(count_key, min(MAX_RUPTURE_MARKERS, st.session_state[count_key] + 1))
+        )
+    with b_col:
+        st.button(
+            "➖ Remove last",
+            key=f"remove_rup_{index}",
+            disabled=(count <= 1),
+            on_click=lambda: st.session_state.__setitem__(count_key, max(1, st.session_state[count_key] - 1))
+        )
+
+    # info text
+    st.caption(f"{st.session_state[count_key]}/{MAX_RUPTURE_MARKERS} markers")
+
 #################################### Streamlit App ####################################
 
 # Function to navigate rows
@@ -397,6 +462,8 @@ def show_field(f: Field, index: int, data_collected):
                         show_field(child, index, data_collected)
             case 'skip_checkbox':
                 st.checkbox(f.title, key=f.name, value=False)
+            case 'rupture_markers':
+                render_rupture_markers_widget(index, rupture_choices)
     else:
         key = f.name + str(index)
         st.session_state.data_inputs_keys.append(f.name)
@@ -516,13 +583,48 @@ def show_fields(fields: List[Field]):
     st.session_state.form_displayed = st.session_state.current_index
 
 def prep_and_save_data(index, skip_sample):
-    save_data({
+    payload = {
         'user_id': st.session_state.user_id,
         'index': st.session_state.current_index,
         **(st.session_state.data.iloc[index][COLS_TO_SAVE].to_dict() if 0 <= index < len(st.session_state.data) else {}),
         **{k: st.session_state[k + str(index)] for k in st.session_state.data_inputs_keys},
         'skip': skip_sample
-    })
+    }
+    # 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)
 
 st.set_page_config(layout='wide')
 # Title of the app