Update app.py

app.py

@@ -1,107 +1,104 @@
 import streamlit as st
-from chest_utils import predict_chest
+from PIL import Image
+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.title("🩺 Disease Prediction App")
+st.set_page_config(page_title="🩺 Health Predictor", layout="centered")
 
-st.markdown(
-    """
-    Welcome to the Chest and Heart Disease Prediction App.  
-    Select the type of prediction from the dropdown below, fill in the details, and click *Predict*.
-    """
-)
+st.title("🩺 Health Predictor")
+st.markdown("Predict your risk for **Chest Disease**, **Heart Disease**, or **Both** in one place.")
 
-option = st.selectbox("Choose the type of prediction:", ["Chest Disease", "Heart Disease", "Combined Prediction"])
+# Sidebar Navigation
+option = st.sidebar.radio("Choose Prediction Type", ["Chest Disease", "Heart Disease", "Combined Prediction"])
 
+# Shared Input
+age = st.slider("Age", 1, 120, 30)
+
+# Chest Disease Section
 if option == "Chest Disease":
-    st.header("🫁 Chest Disease Prediction")
-    age = st.slider("Age", 1, 100, 25)
+    st.header("📷 Chest Disease Prediction")
+
+    st.subheader("Upload Chest X-ray")
+    uploaded_file = st.file_uploader("Choose a chest X-ray image...", type=["jpg", "jpeg", "png"])
+    if uploaded_file:
+        image = Image.open(uploaded_file)
+        st.image(image, caption="Uploaded X-ray", use_column_width=True)
+
     gender = st.selectbox("Gender", ["Male", "Female"])
-    position = st.selectbox("View Position", ["PA", "AP"])
-    condition_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?"
-    ]
-    conditions = [int(st.checkbox(q)) for q in condition_questions]
+    view_position = st.selectbox("View Position", ["PA", "AP"])
+
+    st.subheader("Clinical Questions")
+    disease_inputs = [1 if st.radio(q, ["No", "Yes"], index=0) == "Yes" else 0 for q in condition_questions]
 
     if st.button("Predict Chest Disease"):
-        result = predict_chest(age, gender, position, conditions)
-        st.success(f"Prediction: *{result}*")
+        if not uploaded_file:
+            st.warning("Please upload a chest X-ray image.")
+        else:
+            result = predict_chest(image, age, gender, view_position, disease_inputs)
+            st.success(f"Chest Disease Prediction: {result}")
 
+# Heart Disease Section
 elif option == "Heart Disease":
-    st.header("❤ Heart Disease Prediction")
-    age = st.slider("Age", 1, 100, 40)
-    sex = st.selectbox("Sex", ["Male", "Female"])
+    st.header("❤️ Heart Disease Prediction")
+
+    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", min_value=80, max_value=200, value=120)
-    chol = st.number_input("Serum Cholesterol (mg/dl)", min_value=100, max_value=600, value=200)
-    fbs = st.selectbox("Fasting Blood Sugar > 120 mg/dl", [1, 0])
-    restecg = st.selectbox("Resting ECG Results", [0, 1, 2])
-    thalach = st.number_input("Max Heart Rate Achieved", min_value=60, max_value=220, value=150)
-    exang = st.selectbox("Exercise Induced Angina", [1, 0])
-    oldpeak = st.number_input("ST Depression Induced by Exercise", min_value=0.0, max_value=6.0, value=1.0)
+    trestbps = st.number_input("Resting Blood Pressure", 50, 250)
+    chol = st.number_input("Cholesterol (mg/dL)", 100, 600)
+    fbs = st.selectbox("Fasting Blood Sugar > 120 mg/dl", [0, 1])
+    restecg = st.selectbox("Resting ECG", [0, 1, 2])
+    thalach = st.number_input("Max Heart Rate", 60, 250)
+    exang = st.selectbox("Exercise Induced Angina", [0, 1])
+    oldpeak = st.number_input("ST Depression", 0.0, 10.0, step=0.1)
     slope = st.selectbox("Slope of ST Segment", [0, 1, 2])
-    ca = st.selectbox("Number of Major Vessels (0–3)", [0, 1, 2, 3])
-    thal = st.selectbox("Thalassemia", [1, 2, 3])
+    ca = st.selectbox("Number of Major Vessels (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}*")
+        st.success(f"Heart Disease Prediction: {result}")
 
+# Combined Section
 elif option == "Combined Prediction":
     st.header("🔁 Combined Disease Prediction")
-    age = st.slider("Age", 1, 100, 30)
 
-    st.subheader("Chest Symptoms")
+    # Chest Section
+    st.subheader("Chest Disease Part")
     gender = st.selectbox("Gender", ["Male", "Female"])
-    position = st.selectbox("View Position", ["PA", "AP"])
-    condition_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?"
-    ]
+    view_position = st.selectbox("View Position", ["PA", "AP"])
+    uploaded_file = st.file_uploader("Upload Chest X-ray...", type=["jpg", "jpeg", "png"])
+
+    st.markdown("### Clinical Questions")
     conditions = [int(st.checkbox(q)) for q in condition_questions]
 
-    st.subheader("Heart Parameters")
-    sex = st.selectbox("Sex", ["Male", "Female"], key="heart_sex")
+    # Heart Section
+    st.subheader("Heart Disease Part")
+    sex = st.selectbox("Sex", ["Male", "Female"], key="combined_sex")
+    sex_val = 1 if sex == "Male" else 0
     cp = st.selectbox("Chest Pain Type (cp)", [0, 1, 2, 3])
-    trestbps = st.number_input("Resting Blood Pressure", min_value=80, max_value=200, value=120)
-    chol = st.number_input("Serum Cholesterol (mg/dl)", min_value=100, max_value=600, value=200)
-    fbs = st.selectbox("Fasting Blood Sugar > 120 mg/dl", [1, 0])
-    restecg = st.selectbox("Resting ECG Results", [0, 1, 2])
-    thalach = st.number_input("Max Heart Rate Achieved", min_value=60, max_value=220, value=150)
-    exang = st.selectbox("Exercise Induced Angina", [1, 0])
-    oldpeak = st.number_input("ST Depression Induced by Exercise", min_value=0.0, max_value=6.0, value=1.0)
+    trestbps = st.number_input("Resting Blood Pressure", 80, 200, value=120)
+    chol = st.number_input("Cholesterol (mg/dL)", 100, 600, value=200)
+    fbs = st.selectbox("Fasting Blood Sugar > 120 mg/dl", [0, 1])
+    restecg = st.selectbox("Resting ECG", [0, 1, 2])
+    thalach = st.number_input("Max Heart Rate Achieved", 60, 220, value=150)
+    exang = st.selectbox("Exercise Induced Angina", [0, 1])
+    oldpeak = st.number_input("ST Depression", 0.0, 6.0, value=1.0)
     slope = st.selectbox("Slope of ST Segment", [0, 1, 2])
-    ca = st.selectbox("Number of Major Vessels (0–3)", [0, 1, 2, 3])
+    ca = st.selectbox("Number of Major Vessels (ca)", [0, 1, 2, 3])
     thal = st.selectbox("Thalassemia", [1, 2, 3])
 
     if st.button("Predict Combined Risk"):
-        chest_result = predict_chest(age, gender, position, conditions)
-        heart_result = predict_heart(age, sex, cp, trestbps, chol, fbs, restecg,
-                                     thalach, exang, oldpeak, slope, ca, thal)
-
-        st.success(f"Chest Disease Prediction: *{chest_result}*")
-        st.success(f"Heart Disease Prediction: *{heart_result}*")
-
-        if chest_result == "Chest Disease Detected" or heart_result == "Heart Disease Detected":
-            st.error("⚠ Combined Risk: *High* — Immediate attention recommended.")
+        # Chest Prediction
+        if not uploaded_file:
+            st.warning("Please upload a chest X-ray image.")
         else:
-            st.success("✅ Combined Risk: *Low* — You seem to be in good health.")
+            image = Image.open(uploaded_file)
+            chest_result = predict_chest(image, age, gender, view_position, conditions)
+            heart_result = predict_heart(
+                age, sex_val, cp, trestbps, chol, fbs, restecg,
+                thalach, exang, oldpeak, slope, ca, thal
+            )
+
+            st.success(f"Chest Disease Prediction: {chest_result}")
+            st.success(f"Heart Disease Prediction: {heart_result}")