Update

backend/app.py

@@ -643,6 +643,10 @@ def create_designed_pdf(pdf_path, report_data, analysis_summary_json, annotated_
     if 'YOLO' in model_used or 'yolo' in str(analysis.get('id', '')).lower():
         report_type = "CYTOLOGY"
         report_title = "Cytology Report"
+    elif 'MWT' in model_used or 'mwt' in str(model_used).lower():
+        # MWT is a cytology classifier; use a clearer report title for MWT results
+        report_type = "CYTOLOGY"
+        report_title = "Cytology Analysis Report"
     elif 'CIN' in model_used or 'cin' in str(analysis.get('id', '')).lower() or 'colpo' in str(analysis.get('id', '')).lower():
         report_type = "COLPOSCOPY"
         report_title = "Colposcopy Report"
@@ -694,11 +698,17 @@ def create_designed_pdf(pdf_path, report_data, analysis_summary_json, annotated_
             story.append(Paragraph(f"<b>Benign Confidence:</b> {benign_conf:.2f}%", styles['NormalSmall']))
             story.append(Paragraph(f"<b>Malignant Confidence:</b> {malignant_conf:.2f}%", styles['NormalSmall']))
     elif report_type == "CYTOLOGY":
-        # For cytology (YOLO), show abnormal/normal cells
-        if 'abnormal_cells' in ai_summary:
-            story.append(Paragraph(f"<b>Abnormal Cells:</b> {ai_summary.get('abnormal_cells', 'N/A')}", styles['NormalSmall']))
-        if 'normal_cells' in ai_summary:
-            story.append(Paragraph(f"<b>Normal Cells:</b> {ai_summary.get('normal_cells', 'N/A')}", styles['NormalSmall']))
+        # For cytology and MWT, show class confidences if available, otherwise show abnormal/normal cells
+        confidence_dict = ai_summary.get('confidence', {})
+        if isinstance(confidence_dict, dict) and confidence_dict:
+            for cls, val in confidence_dict.items():
+                conf_pct = val * 100 if isinstance(val, (int, float)) else 0
+                story.append(Paragraph(f"<b>{cls} Confidence:</b> {conf_pct:.2f}%", styles['NormalSmall']))
+        else:
+            if 'abnormal_cells' in ai_summary:
+                story.append(Paragraph(f"<b>Abnormal Cells:</b> {ai_summary.get('abnormal_cells', 'N/A')}", styles['NormalSmall']))
+            if 'normal_cells' in ai_summary:
+                story.append(Paragraph(f"<b>Normal Cells:</b> {ai_summary.get('normal_cells', 'N/A')}", styles['NormalSmall']))
     else:
         # For CIN/Colposcopy, show class confidences
         confidence_dict = ai_summary.get('confidence', {})
@@ -717,8 +727,19 @@ def create_designed_pdf(pdf_path, report_data, analysis_summary_json, annotated_
         try:
             if os.path.isfile(annotated_image_path):
                 story.append(Spacer(1, 0.1*inch))
-                # Use a reasonable width for the embedded image
-                img = ReportLabImage(annotated_image_path, width=5*inch, kind='proportional')
+                # Determine image pixel size and scale to a reasonable width for PDF
+                try:
+                    from PIL import Image as PILImageLocal
+                    with PILImageLocal.open(annotated_image_path) as im:
+                        img_w, img_h = im.size
+                except Exception:
+                    img_w, img_h = (800, 600)
+
+                # Display width in points (ReportLab uses points; 1 inch = 72 points). Assume 96 DPI for pixel->inch.
+                display_width_px = max(300, min(img_w, 800))
+                width_points = min(5 * inch, (display_width_px / 96.0) * inch)
+
+                img = ReportLabImage(annotated_image_path, width=width_points, kind='proportional')
                 story.append(img)
                 story.append(Spacer(1, 0.2*inch))
         except Exception as e:
@@ -812,6 +833,7 @@ async def generate_report(
         annotated_img = ai_summary.get('annotated_image_url') or report_data.get("analysis", {}).get("annotated_image_url") or ""
         annotated_img_full = ""
         annotated_img_local = None
+        annotated_img_display_width = None
 
         if annotated_img:
             # If it's an outputs path served by StaticFiles, map to local file
@@ -836,6 +858,26 @@ async def generate_report(
             except Exception as e:
                 print(f"⚠️ Failed to save uploaded input image for report: {e}")
 
+        # If we have a local image file, compute a reasonable display width (px)
+        try:
+            if annotated_img_local and os.path.isfile(annotated_img_local):
+                from PIL import Image as PILImageLocal
+                with PILImageLocal.open(annotated_img_local) as im:
+                    img_w, img_h = im.size
+                # Choose display width: cap at 800px, don't go below 300px for visibility
+                annotated_img_display_width = max(300, min(img_w, 800))
+            elif annotated_img_full and annotated_img_full.startswith('/outputs/'):
+                # Map to local and attempt to open
+                rel = annotated_img_full[len('/outputs/'):].lstrip('/')
+                candidate = os.path.join(OUTPUT_DIR, rel)
+                if os.path.isfile(candidate):
+                    from PIL import Image as PILImageLocal
+                    with PILImageLocal.open(candidate) as im:
+                        img_w, img_h = im.size
+                    annotated_img_display_width = max(300, min(img_w, 800))
+        except Exception:
+            annotated_img_display_width = None
+
         # Ensure annotated_img_full has a leading slash if it's a relative path
         if annotated_img_full and not annotated_img_full.startswith(('http://', 'https://')):
             annotated_img_full = annotated_img_full if annotated_img_full.startswith('/') else '/' + annotated_img_full
@@ -857,6 +899,10 @@ async def generate_report(
         if 'YOLO' in model_used or 'yolo' in str(analysis_id).lower():
             report_type = "Cytology"
             report_title = "Cytology Report"
+        elif 'MWT' in model_used or 'mwt' in str(model_used).lower() or 'mwt' in str(analysis_id).lower():
+            # MWT is a cytology classifier — use clearer title
+            report_type = "Cytology"
+            report_title = "Cytology Analysis Report"
         elif 'CIN' in model_used or 'cin' in str(analysis_id).lower() or 'colpo' in str(analysis_id).lower():
             report_type = "Colposcopy"
             report_title = "Colposcopy Report"
@@ -881,12 +927,23 @@ async def generate_report(
             <tr><th>Malignant Confidence</th><td>{malignant_conf:.2f}%</td></tr>
             """
         elif report_type == "Cytology":
-            # For cytology (YOLO), show abnormal/normal cells
-            analysis_metrics_html = f"""
-            <tr><th>System</th><td>Manalife AI System — Automated Analysis</td></tr>
-            <tr><th>Abnormal Cells</th><td>{ai_summary.get('abnormal_cells', 'N/A')}</td></tr>
-            <tr><th>Normal Cells</th><td>{ai_summary.get('normal_cells', 'N/A')}</td></tr>
-            """
+            # For cytology (YOLO) or MWT, show class confidences if provided, else abnormal/normal counts
+            confidence_dict = ai_summary.get('confidence', {})
+            if isinstance(confidence_dict, dict) and confidence_dict:
+                confidence_rows = ""
+                for cls, val in confidence_dict.items():
+                    conf_pct = val * 100 if isinstance(val, (int, float)) else 0
+                    confidence_rows += f"<tr><th>{cls} Confidence</th><td>{conf_pct:.2f}%</td></tr>\n            "
+                analysis_metrics_html = f"""
+                <tr><th>System</th><td>Manalife AI System — Automated Analysis</td></tr>
+                {confidence_rows}
+                """
+            else:
+                analysis_metrics_html = f"""
+                <tr><th>System</th><td>Manalife AI System — Automated Analysis</td></tr>
+                <tr><th>Abnormal Cells</th><td>{ai_summary.get('abnormal_cells', 'N/A')}</td></tr>
+                <tr><th>Normal Cells</th><td>{ai_summary.get('normal_cells', 'N/A')}</td></tr>
+                """
         else:
             # For CIN/Colposcopy or other models, show generic confidence
             confidence_dict = ai_summary.get('confidence', {})
@@ -912,6 +969,9 @@ async def generate_report(
             annotated_img_full = ''
         annotated_img = annotated_img_full
 
+        # Prepare width attribute for the HTML img tag if available
+        annotated_img_width_attr = f' width="{annotated_img_display_width}"' if annotated_img_display_width else ''
+
         download_pdf_btn = f'<a href="{pdf_url}" download style="text-decoration:none"><button class="btn-secondary">Download PDF</button></a>' if pdf_url else ''
         
         # Format generated time
@@ -922,7 +982,7 @@ async def generate_report(
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width,initial-scale=1" />
-  <title>Medical Analysis Report — Manalife AI</title>
+    <title>{report_title} — Manalife AI</title>
   <style>
     :root{{--bg:#f8fafc;--card:#ffffff;--muted:#6b7280;--accent:#0f172a}}
     body{{font-family:Inter,ui-sans-serif,system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue",Arial;margin:0;background:var(--bg);color:var(--accent);line-height:1.45}}
@@ -1009,7 +1069,7 @@ async def generate_report(
           </div>
         </div>
 
-        {'<div class="full"><div class="section-title">Annotated Analysis Image</div><img src="' + annotated_img_full + '" class="annotated-image" alt="Annotated Analysis Result" /></div>' if annotated_img else ''}
+    {'<div class="full"><div class="section-title">Annotated Analysis Image</div><img src="' + annotated_img_full + '" class="annotated-image" alt="Annotated Analysis Result"' + annotated_img_width_attr + ' /></div>' if annotated_img else ''}
 
         <div class="full">
           <div class="section-title">Doctor\'s Notes</div>