Update src/streamlit_app.py

src/streamlit_app.py

@@ -54,46 +54,60 @@ st.markdown(
 
 st.divider()
 
-def hla_allele_widget(label: str, key_prefix: str):
-    mode = st.radio(
-        f"{label} entry",
-        ["Unknown", "SELF", "Enter alleles"],
-        horizontal=True,
-        key=f"{key_prefix}_mode",
-        index=0,
-    )
-
-    disabled_nums = (mode != "Enter alleles")
-
+def two_alleles_number_inputs(label: str, key_prefix: str, max_allele: int = 500, disabled: bool = False):
+    """
+    Two numeric allele inputs. 0 = not provided.
+    Returns [] if both 0 else list of strings, e.g. ["12","24"].
+    """
     c1, c2 = st.columns(2)
     with c1:
         a1 = st.number_input(
-            f"{label} Allele 1",
-            min_value=1, max_value=99, step=1,
-            value=1,
-            key=f"{key_prefix}_a1",
-            disabled=disabled_nums,
+            f"{label} allele 1",
+            min_value=0, max_value=max_allele, step=1,
+            value=0,
+            key=f"{key_prefix}_1",
+            disabled=disabled,
         )
     with c2:
         a2 = st.number_input(
-            f"{label} Allele 2 (optional)",
-            min_value=0, max_value=99, step=1,
+            f"{label} allele 2",
+            min_value=0, max_value=max_allele, step=1,
             value=0,
-            key=f"{key_prefix}_a2",
-            help="Set 0 if not applicable",
-            disabled=disabled_nums,
+            key=f"{key_prefix}_2",
+            disabled=disabled,
         )
 
-    if mode == "Unknown":
-        return ["Unknown"]
-    if mode == "SELF":
-        return ["SELF"]
-
-    # Enter alleles
-    alleles = [str(int(a1))]
-    if int(a2) != 0 and int(a2) != int(a1):
-        alleles.append(str(int(a2)))
-    return alleles
+    a1, a2 = int(a1), int(a2)
+    out = []
+    if a1 != 0:
+        out.append(str(a1))
+    if a2 != 0 and a2 != a1:
+        out.append(str(a2))
+    return out
+
+
+def hla_block(person: str, key_prefix: str, enabled: bool):
+    if not enabled:
+        return {
+            f"{key_prefix}_A":  ["Unknown"],
+            f"{key_prefix}_B":  ["Unknown"],
+            f"{key_prefix}_C":  ["Unknown"],
+            f"{key_prefix}_DR": ["Unknown"],
+            f"{key_prefix}_DQ": ["Unknown"],
+        }
+
+    st.markdown(f"###### {person} HLA Alleles")
+
+    def _val(x):
+        return x if (x and len(x) > 0) else ["Unknown"]
+
+    return {
+        f"{key_prefix}_A":  _val(two_alleles_number_inputs(f"{person} HLA-A",  f"{key_prefix}_A")),
+        f"{key_prefix}_B":  _val(two_alleles_number_inputs(f"{person} HLA-B",  f"{key_prefix}_B")),
+        f"{key_prefix}_C":  _val(two_alleles_number_inputs(f"{person} HLA-C",  f"{key_prefix}_C")),
+        f"{key_prefix}_DR": _val(two_alleles_number_inputs(f"{person} HLA-DR", f"{key_prefix}_DR")),
+        f"{key_prefix}_DQ": _val(two_alleles_number_inputs(f"{person} HLA-DQ", f"{key_prefix}_DQ")),
+    }
 
 # Initialize sidebar (model/target/threshold defaults etc.)
 sidebar()
@@ -108,24 +122,10 @@ st.session_state.targets_df = pd.DataFrame()
 min_d = dt.date(1950, 1, 1)
 max_d = dt.date(2050, 12, 31)
 
-st.markdown("###### Recepient HLA Alleles")
-r_hla_a  = hla_allele_widget("R_HLA_A",  "r_hla_a")
-r_hla_b  = hla_allele_widget("R_HLA_B",  "r_hla_b")
-r_hla_c  = hla_allele_widget("R_HLA_C",  "r_hla_c")
-r_hla_dr = hla_allele_widget("R_HLA_DR", "r_hla_dr")
-r_hla_dq = hla_allele_widget("R_HLA_DQ", "r_hla_dq")
-
 
-st.markdown("###### Donor HLA Alleles")
-d_hla_a  = hla_allele_widget("D_HLA_A",  "d_hla_a")
-d_hla_b  = hla_allele_widget("D_HLA_B",  "d_hla_b")
-d_hla_c  = hla_allele_widget("D_HLA_C",  "d_hla_c")
-d_hla_dr = hla_allele_widget("D_HLA_DR", "d_hla_dr")
-d_hla_dq = hla_allele_widget("D_HLA_DQ", "d_hla_dq")
 
-with st.form("individual_form"):
+with st.container():
     st.subheader("Recepient Information", divider=True)
-
     gender = st.radio("Recepient Gender", ["MALE", "FEMALE"], index=None)
 
     dob = st.date_input(
@@ -180,10 +180,7 @@ with st.form("individual_form"):
         key="recepient_blood_group",
     )
 
-    
-
     st.subheader("Donor Information", divider=True)
-
     donor_relation = st.radio(
         "Donor Relation to Recepient",
         ["SELF", "SIBLING", "FIRST DEGREE RELATIVE", "SECOND DEGREE RELATIVE", "RELATED", "UNRELATED", "Unknown"],
@@ -208,10 +205,7 @@ with st.form("individual_form"):
         key="donor_blood_group",
     )
 
-    
-
     st.subheader("Treatment Details", divider=True)
-
     lines_of_rx = st.selectbox("Number of Lines of Rx Before HSCT", [0, 1, 2, 3, 4, 5, 6, 7, "Unknown"], index=None)
 
     conditioning = st.multiselect(
@@ -228,7 +222,6 @@ with st.form("individual_form"):
     )
 
     st.subheader("HSCT Details", divider=True)
-
     hsct_date = st.date_input(
         "HSCT Date",
         value=dt.date(2000, 1, 31),
@@ -246,13 +239,23 @@ with st.form("individual_form"):
     hla_match = st.radio("HLA Match Ratio", ["FULL", "PARTIAL", "HAPLOIDENTICAL", "Unknown"], index=None)
 
     st.subheader("Transplant Risk Modifiers", divider=True)
-
     donor_type = st.selectbox(
         "Donor Type",
         ["MRD", "MMRD", "MUD", "MMUD", "HAPLOIDENTICAL", "CORD", "Unknown"],
         index=None,
     )
 
+    r_hla = {"R_HLA_A":["Unknown"], "R_HLA_B":["Unknown"], "R_HLA_C":["Unknown"], "R_HLA_DR":["Unknown"], "R_HLA_DQ":["Unknown"]}
+    d_hla = {"D_HLA_A":["Unknown"], "D_HLA_B":["Unknown"], "D_HLA_C":["Unknown"], "D_HLA_DR":["Unknown"], "D_HLA_DQ":["Unknown"]}
+    with st.expander("Optional: HLA Allele Details", expanded=False):
+        st.caption("Enter HLA allele data if available to enhance prediction accuracy.")
+    
+        enter_recipient_hla = st.toggle("Enter Recipient HLA alleles", value=False, key="enter_recipient_hla")
+        r_hla = hla_block("Recipient", "R_HLA", enabled=enter_recipient_hla)
+    
+        enter_donor_hla = st.toggle("Enter Donor HLA alleles", value=False, key="enter_donor_hla")
+        d_hla = hla_block("Donor", "D_HLA", enabled=enter_donor_hla)
+    
     conditioning_intensity = st.radio("Conditioning Intensity", ["MAC", "RIC", "NMA", "Unknown"], index=None)
 
     last_followup_date = st.date_input(
@@ -278,7 +281,6 @@ with st.form("individual_form"):
     )
 
     st.subheader("Post-HSCT Treatment and GVHD Prophylaxis", divider=True)
-
     post_hsct_regimen = st.radio("Post-HSCT Regimen", ["YES", "NO", "IVIG", "Unknown"], index=None)
 
     gvhd_prophylaxis = st.multiselect(
@@ -290,9 +292,7 @@ with st.form("individual_form"):
         ]),
         placeholder="Choose option(s)",
     )
-
-    submitted = st.form_submit_button("PREDICT", type="primary")
-
+    submitted = st.button("PREDICT", type="primary", use_container_width=True)
 
 if submitted:
     # Collect input values in a dict
@@ -308,16 +308,17 @@ if submitted:
         "Donor_gender": donor_gender,
         "D_Blood group": donor_blood_group if donor_blood_group != "Unknown" else "X",
 
-        "R_HLA_A": r_hla_a,
-        "R_HLA_B": r_hla_b,
-        "R_HLA_C": r_hla_c,
-        "R_HLA_DR": r_hla_dr,
-        "R_HLA_DQ": r_hla_dq,
-        "D_HLA_A": d_hla_a,
-        "D_HLA_B": d_hla_b,
-        "D_HLA_C": d_hla_c,
-        "D_HLA_DR": d_hla_dr,
-        "D_HLA_DQ": d_hla_dq,
+        "R_HLA_A":  r_hla["R_HLA_A"],
+        "R_HLA_B":  r_hla["R_HLA_B"],
+        "R_HLA_C":  r_hla["R_HLA_C"],
+        "R_HLA_DR": r_hla["R_HLA_DR"],
+        "R_HLA_DQ": r_hla["R_HLA_DQ"],
+        
+        "D_HLA_A":  d_hla["D_HLA_A"],
+        "D_HLA_B":  d_hla["D_HLA_B"],
+        "D_HLA_C":  d_hla["D_HLA_C"],
+        "D_HLA_DR": d_hla["D_HLA_DR"],
+        "D_HLA_DQ": d_hla["D_HLA_DQ"],
 
         "Number of lines of Rx before HSCT": lines_of_rx,
         "PreHSCT conditioning regimen+/-ATG+/-TBI": conditioning,