Update app.py

app.py

@@ -347,6 +347,7 @@ def render_rupture_markers_widget(index: int, choices: list[str]):
         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):
@@ -366,36 +367,27 @@ def render_rupture_markers_widget(index: int, choices: list[str]):
                 if st.session_state.get(marker_key) is not None else 0
             )
         with col2:
-            st.number_input("Lines: from", min_value=0, step=1, key=a_key) \
-                if RUPTURE_LINE_INPUT_TYPE == "number" \
-                else st.text_input("Lines: from", key=a_key, value=st.session_state.get(a_key, ""))
+            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:
-            st.number_input("Lines: to", min_value=0, step=1, key=b_key) \
-                if RUPTURE_LINE_INPUT_TYPE == "number" \
-                else st.text_input("Lines: to", key=b_key, value=st.session_state.get(b_key, ""))
+            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])
-
-    def _inc():
-        st.session_state[count_key] = min(MAX_RUPTURE_MARKERS, st.session_state[count_key] + 1)
-
-    def _dec():
-        st.session_state[count_key] = max(1, st.session_state[count_key] - 1)
-
     with a_col:
-        st.form_submit_button(
-            "➕ Add another rupture marker",
-            disabled=(count >= MAX_RUPTURE_MARKERS),
-            on_click=_inc,
-        )
+        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:
-        st.form_submit_button(
-            "➖ Remove last",
-            disabled=(count <= 1),
-            on_click=_dec,
-        )
+        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")
 
@@ -474,8 +466,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)
+            #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)
@@ -653,7 +645,7 @@ div[data-testid="stMarkdownContainer"] > p {
 
 def add_annotation_guidelines():
     guidelines_text = load_text("texts/guidelines.md")
-    st.write(f"username is {st.session_state.user_id}")
+    #st.write(f"username is {st.session_state.user_id}")
     st.markdown(
         f"<details><summary><b>Annotation Guidelines</b></summary><div>{guidelines_text}</div></details><br>",
     unsafe_allow_html=True)
@@ -745,6 +737,7 @@ elif st.session_state.current_index < len(st.session_state.data):
     #add_annotation_guidelines()
     with st.form("data_form"+str(st.session_state.current_index)):
         show_fields(fields)
+    render_rupture_markers_widget(st.session_state.current_index, rupture_choices)
 
 elif st.session_state.current_index == len(st.session_state.data):
     st.write(f"**Thank you for taking part in this study!** \n ")