Update app.py

app.py

@@ -13,7 +13,6 @@ css = """
 
 with gr.Blocks(title="DiaSpark: Your spark for early detection", css=css) as demo:
 
-    # The user_state now includes a 'username' field
     user_state = gr.State({"email": None, "id": None, "logged_in": False, "gender": None, "username": None})
 
     # --- Static Header (Always Visible) ---
@@ -93,7 +92,7 @@ with gr.Blocks(title="DiaSpark: Your spark for early detection", css=css) as dem
                 signup_btn = gr.Button("Sign Up", variant="primary")
                 show_login_btn = gr.Button("Already have an account? Login.", variant="secondary")
 
-        # --- Prediction Tab ---
+        # --- Prediction Tab (Correctly Ordered) ---
         with gr.TabItem("Prediction", id="prediction_tab"):
             
             with gr.Column(visible=False) as prediction_view:
@@ -116,6 +115,11 @@ with gr.Blocks(title="DiaSpark: Your spark for early detection", css=css) as dem
                     predict_btn = gr.Button("Predict My Risk", variant="primary")
                 
                 result_output = gr.Textbox(label="Prediction Result", interactive=False)
+                
+                # The report generation UI components are defined here
+                generate_report_btn = gr.Button("Download Report as PDF", variant="secondary", visible=False)
+                report_file_output = gr.File(label="Your Report", visible=False)
+                
                 logout_btn = gr.Button("Logout", variant="stop")
 
             with gr.Column(visible=True) as logged_out_view:
@@ -129,71 +133,20 @@ with gr.Blocks(title="DiaSpark: Your spark for early detection", css=css) as dem
                 )
 
 
-    # --- Component Logic (Event Handlers) ---
-    def handle_create_report(user, p, g, b, i, bm, a, result):
-        if not result:
-            return gr.update(visible=False) # Don't show if there's no result
-         # Structure the input data for the report
-        input_data = {
-            "Pregnancies": p if p is not None else 0,
-            "Glucose": g,
-            "Blood Pressure": b,
-            "Insulin": i,
-            "BMI": bm,
-            "Age": a
-        }
-        
-        # Call the generator function
-        file_path = create_report(user, input_data, result)
-        
-        # Return the file path to make it downloadable
-        return gr.update(value=file_path, visible=True)
-        
-    predict_btn.click(
-        fn=predict, 
-        inputs=[preg, glucose, bp, insulin, bmi, age, user_state], 
-        outputs=[result_output]
-    )
-    
-    # NEW: When the prediction is done, show the "Download Report" button
-    result_output.change(
-        fn=lambda x: gr.update(visible=bool(x)), # Show button only if result_output is not empty
-        inputs=result_output,
-        outputs=generate_report_btn
-    )
+    # --- Component Logic (Event Handlers) (Correctly Ordered) ---
 
+    # --- Handlers for UI switching ---
     def switch_to_signup(): return gr.update(visible=False), gr.update(visible=True)
     def switch_to_login(): return gr.update(visible=True), gr.update(visible=False)
     show_signup_btn.click(fn=switch_to_signup, outputs=[login_col, signup_col])
     show_login_btn.click(fn=switch_to_login, outputs=[login_col, signup_col])
-
-    signup_btn.click(
-        fn=register,
-        inputs=[email_signup, pwd_signup, gender_signup, username_signup],
-        outputs=[auth_message, email_signup, pwd_signup, gender_signup, username_signup]
-    )
-    
-    login_btn.click(fn=login, inputs=[email_login, pwd_login, user_state], outputs=[auth_message, user_state, main_tabs])
-    
-    logout_btn.click(
-        fn=logout,
-        inputs=[user_state],
-        outputs=[
-            auth_message, user_state, main_tabs,
-            email_login, pwd_login,
-            preg, glucose, bp, insulin, bmi, age, result_output,
-            pregnancies_row
-        ]
-    )
-    
-    predict_btn.click(fn=predict, inputs=[preg, glucose, bp, insulin, bmi, age, user_state], outputs=[result_output])
     
+    # --- Handler for main state changes (login/logout UI updates) ---
     def handle_user_state_change(user_data):
         is_logged_in = user_data.get("logged_in", False)
         is_female = user_data.get("gender") == "Female"
         username = user_data.get("username", "User")
         welcome_text = f"### 👋 Welcome, {username}!"
-        
         return (
             gr.update(visible=is_logged_in), 
             gr.update(visible=not is_logged_in), 
@@ -201,12 +154,27 @@ with gr.Blocks(title="DiaSpark: Your spark for early detection", css=css) as dem
             gr.update(value=welcome_text), 
             gr.update(visible=is_logged_in)
         )
+    user_state.change(fn=handle_user_state_change, inputs=user_state, outputs=[prediction_view, logged_out_view, pregnancies_row, welcome_message, logged_in_header])
+
+    # --- Handlers for core auth actions ---
+    signup_btn.click(fn=register, inputs=[email_signup, pwd_signup, gender_signup, username_signup], outputs=[auth_message, email_signup, pwd_signup, gender_signup, username_signup])
+    login_btn.click(fn=login, inputs=[email_login, pwd_login, user_state], outputs=[auth_message, user_state, main_tabs])
+    logout_btn.click(fn=logout, inputs=[user_state], outputs=[auth_message, user_state, main_tabs, email_login, pwd_login, preg, glucose, bp, insulin, bmi, age, result_output, pregnancies_row])
+
+    # --- Handlers for prediction and report generation ---
+    def handle_create_report(user, p, g, b, i, bm, a, result):
+        if not result:
+            return gr.update(visible=False)
+        input_data = {"Pregnancies": p if p is not None else 0, "Glucose": g, "Blood Pressure": b, "Insulin": i, "BMI": bm, "Age": a}
+        file_path = create_report(user, input_data, result)
+        return gr.update(value=file_path, visible=True)
+
+    predict_btn.click(fn=predict, inputs=[preg, glucose, bp, insulin, bmi, age, user_state], outputs=[result_output])
+    
+    result_output.change(fn=lambda x: gr.update(visible=bool(x)), inputs=result_output, outputs=generate_report_btn)
+    
+    generate_report_btn.click(fn=handle_create_report, inputs=[user_state, preg, glucose, bp, insulin, bmi, age, result_output], outputs=[report_file_output])
 
-    user_state.change(
-        fn=handle_user_state_change,
-        inputs=user_state,
-        outputs=[prediction_view, logged_out_view, pregnancies_row, welcome_message, logged_in_header]
-    )
 
 # --- Launch the App ---
 if __name__ == "__main__":