Update app.py

app.py

@@ -80,85 +80,94 @@ def preprocess_image(image_bytes):
         raise
 
 def generate_pdf(report_data, filepath):
-    from reportlab.lib.pagesizes import A4
-    from reportlab.pdfgen import canvas
-    from reportlab.lib.units import inch
-    from reportlab.lib import colors
-    from datetime import datetime
-
     c = canvas.Canvas(filepath, pagesize=A4)
     width, height = A4
+
+    # Constants
     margin = 50
-    y = height - margin
+    box_padding = 10
+    current_y = height - margin
 
-    # Logo
-    if os.path.exists(LOGO_PATH):
-        c.drawImage(LOGO_PATH, margin, y - 40, width=60, preserveAspectRatio=True, mask='auto')
+    # Draw logo (top-right)
+    try:
+        if os.path.exists(LOGO_PATH):
+            c.drawImage(LOGO_PATH, width - 100, current_y - 50, width=50, height=50, preserveAspectRatio=True, mask='auto')
+    except Exception as e:
+        logger.warning("Could not load logo: %s", str(e))
 
     # Title
     c.setFillColor(colors.HexColor("#007ACC"))
     c.setFont("Helvetica-Bold", 20)
-    c.drawCentredString(width / 2, y - 20, "Skin Lesion Diagnosis Report")
-    c.setLineWidth(1.5)
-    c.setStrokeColor(colors.HexColor("#007ACC"))
-    c.line(margin, y - 30, width - margin, y - 30)
+    c.drawCentredString(width / 2, current_y, "Skin Lesion Diagnosis Report")
+    c.setStrokeColor(colors.HexColor("#000000"))
+    c.setLineWidth(1)
+    c.line(margin, current_y - 10, width - margin, current_y - 10)
 
-    y -= 60
+    current_y -= 40
 
-    def draw_box(title, lines, box_color=colors.lightgrey, text_color=colors.black):
-        nonlocal y
-        box_height = 20 * len(lines) + 30
-        c.setFillColor(box_color)
-        c.roundRect(margin, y - box_height, width - 2 * margin, box_height, 10, fill=1, stroke=0)
+    def draw_box(title, fields, bg_color=colors.lightgrey):
+        nonlocal current_y
+        box_height = 20 * len(fields) + 30
+        c.setFillColor(bg_color)
+        c.roundRect(margin, current_y - box_height, width - 2 * margin, box_height, radius=8, fill=1)
 
         c.setFillColor(colors.HexColor("#007ACC"))
         c.setFont("Helvetica-Bold", 14)
-        c.drawString(margin + 15, y - 25, title)
-
-        c.setFillColor(text_color)
-        y -= 40
-        for label, value in lines:
-            c.setFont("Helvetica-Bold", 12)
-            c.drawString(margin + 20, y, f"{label}:")
-            c.setFont("Helvetica", 12)
-            c.drawString(margin + 120, y, value)
-            y -= 20
-        y -= 10
-
-    # Patient Info
+        c.drawString(margin + box_padding, current_y - 20, title)
+
+        y_pos = current_y - 40
+        for label, value in fields:
+            c.setFont("Helvetica-Bold", 11)
+            c.setFillColor(colors.black)
+            c.drawString(margin + box_padding, y_pos, f"{label}:")
+            c.setFont("Helvetica", 11)
+            c.drawString(margin + box_padding + 100, y_pos, str(value))
+            y_pos -= 20
+
+        current_y -= box_height + 15
+
+    # Patient details
     draw_box("Patient Details", [
         ("Full Name", report_data.get("name", "N/A")),
         ("Email", report_data.get("email", "N/A")),
         ("Gender", report_data.get("gender", "N/A")),
-        ("Age", str(report_data.get("age", "N/A")))
+        ("Age", report_data.get("age", "N/A")),
     ])
 
-    # Diagnosis Info
+    # Diagnosis
     draw_box("AI Diagnosis Result", [
         ("Prediction", report_data.get("prediction", "N/A")),
         ("Confidence", report_data.get("confidence", "N/A"))
     ])
 
-    # Treatment Info
+    # Treatment
     draw_box("Treatment Recommendations", [
         ("Suggested Solutions", report_data.get("solution", "N/A")),
-        ("Recommended Medicines", report_data.get("medicines", "N/A"))
+        ("Recommended Medicines", report_data.get("medication", "N/A")),
     ])
 
-    # Footer Disclaimer
+    # Disclaimer (Footer)
     disclaimer_text = (
-        "⚠ Disclaimer: This report is AI-generated using a machine learning model and is intended only "
-        "to provide an approximate overview. It is not a substitute for professional medical advice. "
+        "⚠ Disclaimer: This report is AI-generated using a machine learning model and is intended "
+        "only to provide an approximate overview. It is not a substitute for professional medical advice. "
         "Please consult a certified doctor for accurate diagnosis and treatment."
     )
+
     c.setFont("Helvetica", 9)
     c.setFillColor(colors.red)
-    c.drawCentredString(width / 2, 50, disclaimer_text)
+    c.setStrokeColor(colors.red)
+    c.roundRect(margin, margin + 10, width - 2 * margin, 45, radius=6, fill=0)
+    text = c.beginText(margin + 10, margin + 45)
+    text.setFont("Helvetica", 9)
+    text.setFillColor(colors.red)
+    for line in disclaimer_text.split('. '):
+        text.textLine("■ " + line.strip() if line.startswith("⚠") else line.strip())
+    c.drawText(text)
 
     # Timestamp
     c.setFont("Helvetica", 8)
     c.setFillColor(colors.grey)
-    c.drawRightString(width - margin, 35, f"Generated on: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
+    c.drawString(margin, margin, f"Generated on: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
 
     c.save()