Update app.py

app.py

@@ -1,4 +1,6 @@
 from flask import Flask, render_template, request, redirect, url_for, session, send_file
+from flask_sqlalchemy import SQLAlchemy
+from flask_migrate import Migrate
 import tensorflow as tf
 import numpy as np
 from PIL import Image
@@ -18,19 +20,27 @@ from flask import jsonify, url_for
 app = Flask(__name__)
 app.secret_key = "e3f6f40bb8b2471b9f07c4025d845be9"
 
+# Database configuration
+app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///snapsin.db'
+app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+db = SQLAlchemy(app)
+migrate = Migrate(app, db)
+
+# Mail configuration
+app.config['MAIL_SERVER'] = 'smtp.gmail.com'
+app.config['MAIL_PORT'] = 465
+app.config['MAIL_USERNAME'] = os.environ.get('MAIL_USERNAME')
+app.config['MAIL_PASSWORD'] = os.environ.get('MAIL_PASSWORD')
+app.config['MAIL_USE_TLS'] = False
+app.config['MAIL_USE_SSL'] = True
+mail = Mail(app)
+
 MODEL_PATH = "skin_lesion_model.h5"
 HISTORY_PATH = "training_history.pkl"
 PLOT_PATH = "/tmp/static/training_plot.png"
 LOGO_PATH = "static/logo.jpg"
 IMG_SIZE = (224, 224)
 CONFIDENCE_THRESHOLD = 0.30
-app.config['MAIL_SERVER'] = 'smtp.gmail.com'
-app.config['MAIL_PORT'] = 465
-app.config['MAIL_USERNAME'] = os.environ.get('MAIL_USERNAME') # Your Gmail address
-app.config['MAIL_PASSWORD'] = os.environ.get('MAIL_PASSWORD') # Your Gmail App Password
-app.config['MAIL_USE_TLS'] = False
-app.config['MAIL_USE_SSL'] = True
-mail = Mail(app)
 
 label_map = {
     0: "Melanoma",
@@ -122,6 +132,24 @@ recommendations = {
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
+# Database Models
+class User(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(100), nullable=False)
+    email = db.Column(db.String(120), unique=True, nullable=False)
+    scans = db.relationship('Scan', backref='user', lazy=True)
+
+class Scan(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False)
+    patient_name = db.Column(db.String(100), nullable=False)
+    patient_gender = db.Column(db.String(20), nullable=False)
+    patient_age = db.Column(db.Integer, nullable=False)
+    prediction = db.Column(db.String(100), nullable=False)
+    confidence = db.Column(db.String(20), nullable=False)
+    timestamp = db.Column(db.DateTime, default=datetime.utcnow)
+    image_filename = db.Column(db.String(100), nullable=False)
+
 # Load Model
 try:
     logger.info("Loading model from %s", MODEL_PATH)
@@ -171,14 +199,13 @@ def generate_pdf(report, filepath):
 
     # Logo from root directory - square JPG format
     try:
-        logo_path = "./logo.jpg"  # Changed to JPG format
+        logo_path = "./logo.jpg"
         if os.path.exists(logo_path):
-            # Square logo container - no circular mask since logo is square
             c.setFillColor(colors.white)
-            c.rect(65, y-25, 50, 50, fill=1, stroke=1)  # Square container
+            c.rect(65, y-25, 50, 50, fill=1, stroke=1)
             c.setStrokeColor(colors.Color(0.7, 0.7, 0.7, alpha=1))
             c.setLineWidth(1)
-            c.rect(65, y-25, 50, 50, fill=0, stroke=1)  # Square border
+            c.rect(65, y-25, 50, 50, fill=0, stroke=1)
             c.drawImage(logo_path, 67, y-23, width=46, height=46, preserveAspectRatio=True, mask='auto')
     except Exception as e:
         logger.warning("Logo error: %s", str(e))
@@ -204,8 +231,6 @@ def generate_pdf(report, filepath):
         nonlocal y
         
         box_height = len(fields) * 20 + 40
-        
-        # Main box with subtle shadow
         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)
         
@@ -213,11 +238,9 @@ def generate_pdf(report, filepath):
         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))
         
-        # Title bar
         c.setFillColor(colors.Color(0.95, 0.95, 0.95, alpha=1))
         c.rect(40, y - 30, width - 80, 30, fill=1, stroke=0)
         
-        # Title
         c.setFont("Helvetica-Bold", 12)
         c.setFillColor(colors.Color(0.3, 0.3, 0.3, alpha=1))
         c.drawString(55, y - 20, title)
@@ -237,7 +260,6 @@ def generate_pdf(report, filepath):
         
         y -= extra_gap
 
-    # Sections
     professional_section_box("Patient Information", {
         "Name": report["name"],
         "Email": report["email"],
@@ -265,7 +287,6 @@ def generate_pdf(report, filepath):
         f"{i+1}. {line}": "" for i, line in enumerate(treatment["medications"])
     })
 
-    # Professional disclaimer
     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))
@@ -307,16 +328,13 @@ def api_history():
 
     user = User.query.filter_by(email=user_email).first()
     if not user:
-        return jsonify([]) # Return empty list if user not found
+        return jsonify([])
 
     scans = Scan.query.filter_by(user_id=user.id).order_by(Scan.timestamp.desc()).all()
     
     history_data = []
     for scan in scans:
-        # We need to provide the full URL for the image
-        # In a real deployment, you might need to replace 'localhost' with your actual domain
         image_url = url_for('uploaded_file', filename=scan.image_filename, _external=True)
-        
         history_data.append({
             "id": scan.id,
             "prediction": scan.prediction,
@@ -328,7 +346,6 @@ def api_history():
         
     return jsonify(history_data)
 
-# --- New API Endpoint to Email a Report ---
 @app.route("/api/email-report/<int:scan_id>")
 def email_report(scan_id):
     scan = Scan.query.get(scan_id)
@@ -336,17 +353,18 @@ def email_report(scan_id):
         return jsonify({"error": "Report not found"}), 404
 
     try:
-        # Generate the PDF report
         report_data = {
-            "name": scan.user.name, "email": scan.user.email,
-            "gender": scan.patient_gender, "age": scan.patient_age,
-            "prediction": scan.prediction, "confidence": scan.confidence,
+            "name": scan.user.name,
+            "email": scan.user.email,
+            "gender": scan.patient_gender,
+            "age": scan.patient_age,
+            "prediction": scan.prediction,
+            "confidence": scan.confidence,
             "message": ""
         }
         pdf_path = f"/tmp/report_{scan_id}.pdf"
         generate_pdf(report_data, pdf_path)
 
-        # Create and send the email
         msg = Message(
             'Your SnapSkin Diagnostic Report',
             sender=app.config['MAIL_USERNAME'],
@@ -357,8 +375,6 @@ def email_report(scan_id):
             msg.attach(f"SnapSkin_Report_{scan_id}.pdf", "application/pdf", fp.read())
         
         mail.send(msg)
-        
-        # Clean up the temporary PDF file
         os.remove(pdf_path)
 
         return jsonify({"success": True, "message": f"Report sent to {scan.user.email}"})
@@ -367,34 +383,86 @@ def email_report(scan_id):
         logger.error(f"Failed to send email for scan {scan_id}: {e}")
         return jsonify({"success": False, "message": "Failed to send email."}), 500
 
-
 @app.route("/predict", methods=["POST"])
 def predict():
     try:
         if "image" not in request.files:
             raise ValueError("No image uploaded.")
-        image = request.files["image"].read()
-        img_array = preprocess_image(image)
+        image = request.files["image"]
+        image_bytes = image.read()
+        img_array = preprocess_image(image_bytes)
         prediction = model.predict(img_array)[0]
         predicted_index = int(np.argmax(prediction))
         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"),
+            patient_gender=request.form.get("gender"),
+            patient_age=int(request.form.get("age")),
+            prediction=label,
+            confidence=f"{confidence * 100:.2f}%",
+            image_filename=image_filename
+        )
+        db.session.add(scan)
+        db.session.commit()
+
         report = {
             "name": request.form.get("name"),
-            "email": request.form.get("email"),
+            "email": email,
             "gender": request.form.get("gender"),
             "age": request.form.get("age"),
             "prediction": label,
             "confidence": f"{confidence * 100:.2f}%",
-            "message": msg
+            "message": msg,
+            "scan_id": scan.id
         }
         session["report"] = report
+
+        # Send email automatically
+        try:
+            pdf_path = f"/tmp/report_{scan.id}.pdf"
+            generate_pdf(report, pdf_path)
+            msg = Message(
+                'Your SnapSkin Diagnostic Report',
+                sender=app.config['MAIL_USERNAME'],
+                recipients=[email]
+            )
+            msg.body = f"Dear {report['name']},\n\nPlease find your 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)
+            report["email_status"] = "Report sent to your email."
+        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:
         return render_template("form.html", history_plot="/training_plot.png", result={
-            "prediction": "Error", "confidence": "N/A", "message": str(e)
+            "prediction": "Error",
+            "confidence": "N/A",
+            "message": str(e),
+            "email_status": "Error occurred, no email sent."
         })
 
 @app.route("/result")
@@ -413,5 +481,11 @@ def download_report():
     generate_pdf(report, filepath)
     return send_file(filepath, as_attachment=True)
 
+@app.route("/uploads/<filename>")
+def uploaded_file(filename):
+    return send_file(os.path.join("static/uploads", filename))
+
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=7860)
+    with app.app_context():
+        db.create_all()
+    app.run(host="0.0.0.0", port=7860)