Update app.py

app.py

@@ -8,7 +8,6 @@ import numpy as np
 from PIL import Image
 import pickle
 import io
-import os
 import matplotlib.pyplot as plt
 from reportlab.lib.pagesizes import A4
 from reportlab.lib import colors
@@ -41,6 +40,7 @@ MODEL_PATH = "skin_lesion_model.h5"
 HISTORY_PATH = "training_history.pkl"
 PLOT_PATH = "/tmp/static/training_plot.png"
 LOGO_PATH = "static/logo.jpg"
+FORM_TEMPLATE = "form.html"
 IMG_SIZE = (224, 224)
 CONFIDENCE_THRESHOLD = 0.30
 
@@ -220,7 +220,7 @@ def generate_pdf(report, filepath):
         c.setFillColor(colors.Color(0.94, 0.96, 0.98, alpha=1))
         c.rect(0, height-120, width, 120, fill=1, stroke=0)
 
-        # Logo from root directory - square JPG format
+        # Logo
         try:
             if os.path.exists(LOGO_PATH):
                 c.setFillColor(colors.white)
@@ -253,26 +253,20 @@ def generate_pdf(report, filepath):
 
         def professional_section_box(title, fields, extra_gap=20):
             nonlocal y
-            
             box_height = len(fields) * 20 + 40
             c.setFillColor(colors.Color(0.96, 0.96, 0.96, alpha=0.3))
             c.rect(42, y - box_height - 2, width - 84, box_height, fill=1, stroke=0)
-            
             c.setFillColor(colors.white)
             c.rect(40, y - box_height, width - 80, box_height, fill=1, stroke=1)
             c.setStrokeColor(colors.Color(0.9, 0.9, 0.9, alpha=1))
-            
             c.setFillColor(colors.Color(0.95, 0.95, 0.95, alpha=1))
             c.rect(40, y - 30, width - 80, 30, fill=1, stroke=0)
-            
             c.setFont("Helvetica-Bold", 12)
             c.setFillColor(colors.Color(0.3, 0.3, 0.3, alpha=1))
             c.drawString(55, y - 20, title)
-            
             y -= 45
             c.setFont("Helvetica", 10)
             c.setFillColor(colors.Color(0.2, 0.2, 0.2, alpha=1))
-            
             for label, val in fields.items():
                 c.setFont("Helvetica-Bold", 9)
                 c.setFillColor(colors.Color(0.4, 0.4, 0.4, alpha=1))
@@ -281,7 +275,6 @@ def generate_pdf(report, filepath):
                 c.setFillColor(colors.Color(0.2, 0.2, 0.2, alpha=1))
                 c.drawString(150, y, str(val))
                 y -= 20
-            
             y -= extra_gap
 
         professional_section_box("Patient Information", {
@@ -314,11 +307,9 @@ def generate_pdf(report, filepath):
         c.setFillColor(colors.Color(0.98, 0.98, 0.98, alpha=1))
         c.rect(40, 40, width - 80, 70, fill=1, stroke=1)
         c.setStrokeColor(colors.Color(0.9, 0.9, 0.9, alpha=1))
-        
         c.setFont("Helvetica-Bold", 10)
         c.setFillColor(colors.Color(0.4, 0.4, 0.4, alpha=1))
         c.drawString(50, 95, "Medical Disclaimer")
-        
         c.setFont("Helvetica", 8)
         c.setFillColor(colors.Color(0.3, 0.3, 0.3, alpha=1))
         disclaimer_lines = [
@@ -326,7 +317,6 @@ def generate_pdf(report, filepath):
             "Results should not replace professional medical consultation and diagnosis.",
             "Please consult a qualified healthcare provider for comprehensive medical evaluation."
         ]
-        
         for i, line in enumerate(disclaimer_lines):
             c.drawString(50, 80 - (i * 10), line)
 
@@ -341,7 +331,7 @@ def home():
         return redirect(url_for("form"))
     except Exception as e:
         logger.error("Error in home route: %s", str(e))
-        return render_template("form.html", history_plot=None, result={
+        return render_template(FORM_TEMPLATE, history_plot=None, result={
             "prediction": "Error",
             "confidence": "N/A",
             "message": f"Failed to load page: {str(e)}",
@@ -351,26 +341,27 @@ def home():
 @app.route("/form")
 def form():
     try:
-        # Check for required environment variables
+        if not os.path.exists(os.path.join(app.template_folder, FORM_TEMPLATE)):
+            logger.error("Template %s not found", FORM_TEMPLATE)
+            return jsonify({"error": "Form template not found"}), 500
         if not app.config['MAIL_USERNAME'] or not app.config['MAIL_PASSWORD']:
             logger.warning("Mail configuration missing, email functionality may fail")
-        # Check if model loaded successfully
         if model_load_error:
-            return render_template("form.html", history_plot="/training_plot.png", result={
+            return render_template(FORM_TEMPLATE, history_plot="/training_plot.png", result={
                 "prediction": "Error",
                 "confidence": "N/A",
                 "message": f"Model loading failed: {model_load_error}",
                 "email_status": "N/A"
             })
-        return render_template("form.html", history_plot="/training_plot.png")
+        return render_template(FORM_TEMPLATE, history_plot="/training_plot.png")
     except Exception as e:
         logger.error("Error rendering form: %s", str(e))
-        return render_template("form.html", history_plot=None, result={
+        return render_template(FORM_TEMPLATE, history_plot=None, result={
             "prediction": "Error",
             "confidence": "N/A",
             "message": f"Failed to load form: {str(e)}",
             "email_status": "N/A"
-        })
+        }, status=500)
 
 @app.route("/training_plot.png")
 def training_plot():
@@ -390,25 +381,18 @@ def api_history():
         user_email = request.args.get('email')
         if not user_email:
             return jsonify({"error": "Email parameter is required"}), 400
-
         user = User.query.filter_by(email=user_email).first()
         if not user:
             return jsonify([])
-
         scans = Scan.query.filter_by(user_id=user.id).order_by(Scan.timestamp.desc()).all()
-        
-        history_data = []
-        for scan in scans:
-            image_url = url_for('uploaded_file', filename=scan.image_filename, _external=True)
-            history_data.append({
-                "id": scan.id,
-                "prediction": scan.prediction,
-                "confidence": scan.confidence,
-                "timestamp": scan.timestamp.strftime("%B %d, %Y at %I:%M %p"),
-                "patient_name": scan.patient_name,
-                "image_url": image_url
-            })
-        
+        history_data = [{
+            "id": scan.id,
+            "prediction": scan.prediction,
+            "confidence": scan.confidence,
+            "timestamp": scan.timestamp.strftime("%B %d, %Y at %I:%M %p"),
+            "patient_name": scan.patient_name,
+            "image_url": url_for('uploaded_file', filename=scan.image_filename, _external=True)
+        } for scan in scans]
         return jsonify(history_data)
     except Exception as e:
         logger.error("Error in history API: %s", str(e))
@@ -420,7 +404,6 @@ def email_report(scan_id):
         scan = Scan.query.get(scan_id)
         if not scan:
             return jsonify({"error": "Report not found"}), 404
-
         report_data = {
             "name": scan.user.name,
             "email": scan.user.email,
@@ -432,7 +415,6 @@ def email_report(scan_id):
         }
         pdf_path = f"/tmp/report_{scan_id}.pdf"
         generate_pdf(report_data, pdf_path)
-
         msg = Message(
             'Your SnapSkin Diagnostic Report',
             sender=app.config['MAIL_USERNAME'],
@@ -441,10 +423,8 @@ def email_report(scan_id):
         msg.body = f"Dear {scan.user.name},\n\nPlease find your requested diagnostic report attached.\n\nThank you for using SnapSkin."
         with app.open_resource(pdf_path) as fp:
             msg.attach(f"SnapSkin_Report_{scan_id}.pdf", "application/pdf", fp.read())
-        
         mail.send(msg)
         os.remove(pdf_path)
-
         return jsonify({"success": True, "message": f"Report sent to {scan.user.email}"})
     except Exception as e:
         logger.error(f"Failed to send email for scan {scan_id}: {e}")
@@ -465,23 +445,18 @@ def predict():
         confidence = float(prediction[predicted_index])
         label = label_map.get(predicted_index, "Unknown") if confidence >= CONFIDENCE_THRESHOLD else "Low confidence"
         msg = "⚠ This image is not confidently recognized. Please upload a clearer image." if confidence < CONFIDENCE_THRESHOLD else ""
-
-        # Save user and scan data
         email = request.form.get("email")
         user = User.query.filter_by(email=email).first()
         if not user:
             user = User(name=request.form.get("name"), email=email)
             db.session.add(user)
             db.session.commit()
-
-        # Save image
         timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
         image_filename = f"scan_{timestamp}.jpg"
         image_path = os.path.join("static/uploads", image_filename)
         os.makedirs("static/uploads", exist_ok=True)
         image.seek(0)
         image.save(image_path)
-
         scan = Scan(
             user_id=user.id,
             patient_name=request.form.get("name"),
@@ -493,7 +468,6 @@ def predict():
         )
         db.session.add(scan)
         db.session.commit()
-
         report = {
             "name": request.form.get("name"),
             "email": email,
@@ -505,8 +479,6 @@ def predict():
             "scan_id": scan.id
         }
         session["report"] = report
-
-        # Send email automatically
         try:
             if not app.config['MAIL_USERNAME'] or not app.config['MAIL_PASSWORD']:
                 raise ValueError("Mail configuration missing")
@@ -526,11 +498,10 @@ def predict():
         except Exception as e:
             logger.error(f"Failed to send email: {e}")
             report["email_status"] = "Failed to send report to email."
-
         return redirect(url_for("result"))
     except Exception as e:
         logger.error("Prediction error: %s", str(e))
-        return render_template("form.html", history_plot="/training_plot.png", result={
+        return render_template(FORM_TEMPLATE, history_plot="/training_plot.png", result={
             "prediction": "Error",
             "confidence": "N/A",
             "message": f"Prediction failed: {str(e)}",
@@ -540,16 +511,19 @@ def predict():
 @app.route("/result")
 def result():
     try:
+        if not os.path.exists(os.path.join(app.template_folder, FORM_TEMPLATE)):
+            logger.error("Template %s not found", FORM_TEMPLATE)
+            return jsonify({"error": "Form template not found"}), 500
         report = session.get("report", {})
-        return render_template("form.html", **report)
+        return render_template(FORM_TEMPLATE, **report)
     except Exception as e:
         logger.error("Error rendering result: %s", str(e))
-        return render_template("form.html", history_plot="/training_plot.png", result={
+        return render_template(FORM_TEMPLATE, history_plot="/training_plot.png", result={
             "prediction": "Error",
             "confidence": "N/A",
             "message": f"Failed to load result: {str(e)}",
             "email_status": "N/A"
-        })
+        }, status=500)
 
 @app.route("/download-report")
 def download_report():
@@ -583,6 +557,10 @@ if __name__ == "__main__":
     try:
         with app.app_context():
             db.create_all()
+        static_files = ["form-styles.css", "preloader.js", "cursor-effect.js", "logo.png"]
+        for file in static_files:
+            if not os.path.exists(os.path.join("static", file)):
+                logger.warning("Static file %s not found", file)
         app.run(host="0.0.0.0", port=7860)
     except Exception as e:
         logger.error("Application startup error: %s", str(e))