Update app.py

app.py

@@ -646,33 +646,40 @@ def show_fields(fields: List[Field]):
     st.session_state.form_displayed = st.session_state.current_index
 '''
 def show_field(f: Field, index: int, data_collected):
-    """Render a Field tree. No form logic; everything runs outside forms."""
-    # Non-input widgets (custom structural types)
+    """Render a Field tree. Pure rendering (no form submit logic here)."""
+
+    # ---------- Non-input / structural types ----------
     if f.type not in INPUT_FIELD_DEFAULT_VALUES.keys():
         match f.type:
             case 'input_col':
-                # Safely read a column from the current CSV row (or None if missing)
-                value = st.session_state.data.iloc[index][f.name] if (
-                    f.name and f.name in st.session_state.data.columns
-                ) else None
-
-                # Render based on field name
+                # Safely read CSV value if the column exists
+                value = (
+                    st.session_state.data.iloc[index][f.name]
+                    if f.name and f.name in st.session_state.data.columns
+                    else None
+                )
+
+                # Render by name
                 if f.name == 'image_name' and value:
                     display_image(os.path.join(input_repo_path, 'images', value))
+
                 elif f.name == 'dialogue_name' and value:
                     render_dialogue(
                         os.path.join(input_repo_path, 'dialogues', value),
                         width_chars=115, height_px=520, show_border=False
                     )
+
                 elif f.name == 'patient' and value:
                     st.markdown(f"## Patient:  {value}")
+
                 elif value not in (None, np.nan, ""):
                     # generic fallback
-                    st.write(f.title)
+                    if f.title:
+                        st.write(f.title)
                     st.write(value)
 
             case 'markdown':
-                # If a file path is provided, load & render it; otherwise render the title string
+                # Either render file contents, or the literal title as markdown
                 path = f.other_params.get("path") if f.other_params else None
                 if path:
                     content = load_text(os.path.join(input_repo_path, path))
@@ -681,7 +688,7 @@ def show_field(f: Field, index: int, data_collected):
                     st.markdown(f.title)
 
             case 'expander':
-                # Markdown header above; expander label is plain text
+                # Markdown header above; expander label is plain text (blank)
                 st.markdown(f.title)
                 with st.expander(""):
                     for child in (f.children or []):
@@ -694,20 +701,25 @@ def show_field(f: Field, index: int, data_collected):
                         show_field(child, index, data_collected)
 
             case 'skip_checkbox':
-                # outside forms this is fine
+                # Lives fine outside forms
                 st.checkbox(f.title, key=f.name, value=False)
 
             case 'rupture_markers':
-                # dynamic widget (outside forms)
+                # Dynamic add/remove rows (outside forms so buttons rerun)
                 render_rupture_markers_widget(index, rupture_choices)
 
-        return  # done with non-input types
+        return  # done with structural types
 
-    # Input widgets (saved via data_inputs_keys)
+    # ---------- Input types (saved to session & later to JSON) ----------
     key = f.name + str(index)
+    # track the logical field name once per page; prep_and_save_data relies on this
     st.session_state.data_inputs_keys.append(f.name)
 
-    # Initial value: session_state > saved JSON > default
+    # Compose title with inline help (no stray/bare expression)
+    if not SHOW_HELP_ICON:
+        f.title = f'**{f.title}**\n\n{f.help}' if f.help else f.title
+
+    # Resolve initial value: session_state > saved JSON > default
     if key in st.session_state:
         value = st.session_state[key]
     elif data_collected and f.name in data_collected:
@@ -715,54 +727,91 @@ def show_field(f: Field, index: int, data_collected):
     else:
         value = INPUT_FIELD_DEFAULT_VALUES[f.type]
 
-    # Render inputs
     match f.type:
         case 'checkbox':
             st.checkbox(f.title, key=key, value=value, help=f.help)
 
         case 'radio':
-            labels = f.other_params.get('labels') if f.other_params and f.other_params.get('labels') else default_labels
-            st.radio(f.title,
-                     options=range(len(labels)),
-                     format_func=lambda x: labels[x],
-                     key=key,
-                     index=value if value is not None else 0,
-                     help=f.help, horizontal=False)
+            labels = (f.other_params.get('labels')
+                      if f.other_params and f.other_params.get('labels')
+                      else default_labels)
+            st.radio(
+                f.title,
+                options=range(len(labels)),
+                format_func=lambda x: labels[x],
+                key=key,
+                index=(value if value is not None else 0),
+                help=f.help,
+                horizontal=False
+            )
 
         case 'slider':
-            st.slider(f.title, min_value=0, max_value=6, step=1, key=key, value=value, help=f.help)
+            st.slider(f.title, min_value=0, max_value=6, step=1, key=key,
+                      value=value, help=f.help)
 
         case 'select_slider':
-            labels = f.other_params.get('labels') if f.other_params and f.other_params.get('labels') else default_labels
-            st.select_slider(f.title,
-                             options=[0, 20, 40, 60, 80, 100],
-                             format_func=lambda x: labels[x // 20],
-                             key=key, value=value, help=f.help)
+            labels = (f.other_params.get('labels')
+                      if f.other_params and f.other_params.get('labels')
+                      else default_labels)
+            st.select_slider(
+                f.title,
+                options=[0, 20, 40, 60, 80, 100],
+                format_func=lambda x: labels[x // 20],
+                key=key,
+                value=value,
+                help=f.help
+            )
 
         case 'multiselect':
-            choices = f.other_params.get('choices') if f.other_params and f.other_params.get('choices') else default_choices
-            st.multiselect(f.title, options=choices, format_func=lambda x: x,
-                           key=key, max_selections=3, default=value, help=f.help)
+            choices = (f.other_params.get('choices')
+                       if f.other_params and f.other_params.get('choices')
+                       else default_choices)
+            st.multiselect(
+                f.title,
+                options=choices,
+                format_func=lambda x: x,
+                key=key,
+                default=value,
+                max_selections=3,
+                help=f.help
+            )
 
         case 'likert_radio':
-            labels = f.other_params.get('labels') if f.other_params and f.other_params.get('labels') else default_labels
-            st.radio(f.title, options=[0, 1, 2, 3, 4],
-                     format_func=lambda x: labels[x],
-                     key=key, index=value if value is not None else 0,
-                     help=f.help, horizontal=True)
+            labels = (f.other_params.get('labels')
+                      if f.other_params and f.other_params.get('labels')
+                      else default_labels)
+            st.radio(
+                f.title,
+                options=[0, 1, 2, 3, 4],
+                format_func=lambda x: labels[x],
+                key=key,
+                index=(value if value is not None else 0),
+                help=f.help,
+                horizontal=True
+            )
 
         case 'y_n_radio':
-            labels = f.other_params.get('labels') if f.other_params and f.other_params.get('labels') else yes_no_labels
-            st.radio(f.title, options=[0, 1],
-                     format_func=lambda x: labels[x],
-                     key=key, index=value if value is not None else 0,
-                     help=f.help, horizontal=True)
+            labels = (f.other_params.get('labels')
+                      if f.other_params and f.other_params.get('labels')
+                      else yes_no_labels)
+            st.radio(
+                f.title,
+                options=[0, 1],
+                format_func=lambda x: labels[x],
+                key=key,
+                index=(value if value is not None else 0),
+                help=f.help,
+                horizontal=True
+            )
 
         case 'text':
-            st.text_input(f.title, key=key, value=value if value is not None else "", max_chars=None)
+            st.text_input(f.title, key=key, value=(value if value is not None else ""),
+                          max_chars=None, help=f.help)
 
         case 'textarea':
-            st.text_area(f.title, key=key, value=value if value is not None else "", max_chars=None)
+            st.text_area(f.title, key=key, value=(value if value is not None else ""),
+                         max_chars=None, help=f.help)
+
 
 
 def show_fields(fields: List[Field]):