Update app.py

app.py

@@ -1,107 +1,63 @@
 import streamlit as st
 from PIL import Image
-from chest_utils import predict_chest
+from chest_utils import predict_chest, condition_questions
 from heart_utils import predict_heart
 
-st.set_page_config(page_title="🩺 Disease Prediction App", layout="centered")
+st.set_page_config(page_title="Health Predictor", layout="centered")
 
-# Initialize navigation state
-if "page" not in st.session_state:
-    st.session_state.page = "heart"
+st.title("🩺 Health Predictor")
+st.markdown("Supports both *Chest Disease* and *Heart Disease* predictions.")
 
-st.title("🩺 Disease Prediction App")
-st.markdown("Follow the steps to assess your **Heart**, **Chest**, and **Combined Health Risk**.")
+# Sidebar for navigation
+disease_type = st.sidebar.radio("Select Disease Type", ["Chest Disease", "Heart Disease"])
 
-# ─────── STEP 1: HEART DISEASE ─────── #
-if st.session_state.page == "heart":
-    st.header("❤️ Step 1: Heart Disease Prediction")
+if disease_type == "Chest Disease":
+    st.header("Chest Disease Prediction")
 
-    st.session_state.age = st.slider("Age", 1, 100, 30)
-    sex = st.selectbox("Sex", ["Male", "Female"])
-    st.session_state.sex = 1 if sex == "Male" else 0
+    st.subheader("Upload Chest X-ray")
+    uploaded_file = st.file_uploader("Choose a chest X-ray image...", type=["jpg", "jpeg", "png"])
 
-    st.session_state.cp = st.selectbox("Chest Pain Type", [0, 1, 2, 3])
-    st.session_state.trestbps = st.number_input("Resting Blood Pressure", 80, 200, 120)
-    st.session_state.chol = st.number_input("Serum Cholesterol (mg/dl)", 100, 600, 200)
-    st.session_state.fbs = st.selectbox("Fasting Blood Sugar > 120 mg/dl", [0, 1])
-    st.session_state.restecg = st.selectbox("Resting ECG", [0, 1, 2])
-    st.session_state.thalach = st.number_input("Max Heart Rate", 60, 250, 150)
-    st.session_state.exang = st.selectbox("Exercise Induced Angina", [0, 1])
-    st.session_state.oldpeak = st.number_input("ST Depression", 0.0, 6.0, 1.0)
-    st.session_state.slope = st.selectbox("Slope of ST Segment", [0, 1, 2])
-    st.session_state.ca = st.selectbox("Number of Major Vessels", [0, 1, 2, 3])
-    st.session_state.thal = st.selectbox("Thalassemia", [1, 2, 3])
-
-    if st.button("Next → Chest Symptoms"):
-        st.session_state.heart_result = predict_heart(
-            st.session_state.age, st.session_state.sex, st.session_state.cp, st.session_state.trestbps,
-            st.session_state.chol, st.session_state.fbs, st.session_state.restecg, st.session_state.thalach,
-            st.session_state.exang, st.session_state.oldpeak, st.session_state.slope,
-            st.session_state.ca, st.session_state.thal
-        )
-        st.session_state.page = "chest"
-        st.rerun()
-
-# ─────── STEP 2: CHEST DISEASE ─────── #
-elif st.session_state.page == "chest":
-    st.header("🫁 Step 2: Chest Disease Symptoms")
-
-    st.session_state.gender = st.selectbox("Gender", ["Male", "Female"])
-    st.session_state.position = st.selectbox("View Position", ["PA", "AP"])
-
-    uploaded_file = st.file_uploader("Upload Chest X-ray", type=["jpg", "jpeg", "png"])
     if uploaded_file:
-        st.session_state.image = Image.open(uploaded_file)
-        st.image(st.session_state.image, caption="Uploaded X-ray", use_column_width=True)
-
-    st.subheader("Answer Clinical Questions:")
-    questions = [
-        "Do you have a cough?",
-        "Do you feel shortness of breath?",
-        "Are you experiencing chest pain?",
-        "Do you smoke?",
-        "Do you have a fever?",
-        "Do you have fatigue?",
-        "Have you had recent respiratory infection?",
-        "Do you have a family history of lung issues?",
-        "Do you feel wheezing or noisy breathing?",
-        "Have you been exposed to pollution or chemicals recently?"
-    ]
-    st.session_state.conditions = [1 if st.checkbox(q) else 0 for q in questions]
-
-    if st.button("Next → Combined Prediction"):
-        if uploaded_file:
-            st.session_state.page = "combined"
-            st.rerun()
+        image = Image.open(uploaded_file)
+        st.image(image, caption="Uploaded X-ray", use_column_width=True)
+
+    age = st.number_input("Age", min_value=1, max_value=120, step=1)
+    gender = st.selectbox("Gender", ["Male", "Female"])
+    view_position = st.selectbox("View Position", ["PA", "AP"])
+
+    st.subheader("Answer the following clinical questions:")
+    disease_inputs = []
+    for question in condition_questions:
+        answer = st.radio(question, ["No", "Yes"], index=0, key=question)
+        disease_inputs.append(1 if answer == "Yes" else 0)
+
+    if st.button("Predict Chest Disease"):
+        if uploaded_file is None:
+            st.warning("Please upload a chest X-ray image.")
         else:
-            st.warning("Please upload a chest X-ray to continue.")
-
-# ─────── STEP 3: COMBINED PREDICTION ─────── #
-elif st.session_state.page == "combined":
-    st.header("🔁 Step 3: Combined Prediction Results")
-
-    chest_result = predict_chest(
-        st.session_state.age,
-        st.session_state.gender,
-        st.session_state.position,
-        st.session_state.conditions
-    )
-    heart_result = st.session_state.heart_result
-
-    st.image(st.session_state.image, caption="Chest X-ray", use_column_width=True)
-
-    if chest_result == "Chest Disease Detected":
-        st.error(f"❌ Chest Disease Prediction: **{chest_result}**")
-    else:
-        st.success(f"✅ Chest Disease Prediction: **{chest_result}**")
-
-    st.success(f"❤️ Heart Disease Prediction: **{heart_result}**")
-
-    if "Detected" in chest_result or "Detected" in heart_result:
-        st.error("⚠️ Combined Risk: **High** — Immediate attention recommended.")
-    else:
-        st.success("✅ Combined Risk: **Low** — You seem to be in good health.")
-
-    if st.button("🔁 Start Over"):
-        st.session_state.clear()
-        st.rerun()
+            result = predict_chest(age, gender, view_position, disease_inputs)
+            st.success(f"Prediction: {result}")
+
+elif disease_type == "Heart Disease":
+    st.header("Heart Disease Prediction")
+
+    age = st.number_input("Age", min_value=1, max_value=120, step=1)
+    sex = st.selectbox("Sex", [0, 1], format_func=lambda x: "Male" if x == 1 else "Female")
+    cp = st.selectbox("Chest Pain Type (cp)", [0, 1, 2, 3])
+    trestbps = st.number_input("Resting Blood Pressure (trestbps)", min_value=50, max_value=250)
+    chol = st.number_input("Cholesterol (chol)", min_value=100, max_value=600)
+    fbs = st.selectbox("Fasting Blood Sugar > 120 mg/dl (fbs)", [0, 1])
+    restecg = st.selectbox("Resting ECG (restecg)", [0, 1, 2])
+    thalach = st.number_input("Max Heart Rate (thalach)", min_value=60, max_value=250)
+    exang = st.selectbox("Exercise Induced Angina (exang)", [0, 1])
+    oldpeak = st.number_input("ST depression (oldpeak)", min_value=0.0, max_value=10.0, step=0.1)
+    slope = st.selectbox("Slope of peak exercise ST segment", [0, 1, 2])
+    ca = st.selectbox("Number of major vessels colored by fluoroscopy (ca)", [0, 1, 2, 3, 4])
+    thal = st.selectbox("Thal", [0, 1, 2, 3])
+
+    if st.button("Predict Heart Disease"):
+        result = predict_heart(
+            age, sex, cp, trestbps, chol, fbs, restecg,
+            thalach, exang, oldpeak, slope, ca, thal
+        )
+        st.success(f"Prediction: {result}")