Update

backend/app.py

@@ -488,27 +488,12 @@ async def predict(model_name: str = Form(...), file: UploadFile = File(...)):
         # Generate a brief AI interpretation using the Mistral client (if available)
         ai_interp = generate_mwt_summary(predicted_label, confidences, avg_confidence)
 
-        # Save the input image to outputs/images so reports can embed it when no
-        # annotated image is produced by the model (MWT is a classifier only).
-        try:
-            os.makedirs(IMAGES_DIR, exist_ok=True)
-            input_filename = f"input_{uuid.uuid4().hex[:8]}.jpg"
-            input_path = os.path.join(IMAGES_DIR, input_filename)
-            # 'contents' was read earlier from the uploaded file
-            with open(input_path, 'wb') as out_f:
-                out_f.write(contents)
-            input_image_url = f"/outputs/images/{input_filename}"
-        except Exception as e:
-            print(f"⚠️ Failed to save input image for MWT report embedding: {e}")
-            input_image_url = ""
-
         return {
             "model_used": "MWT Classifier",
             "prediction": predicted_label,
             "confidence": confidences,
             "summary": {
                 "ai_interpretation": ai_interp,
-                "annotated_image_url": input_image_url,
             },
         }
 
@@ -848,7 +833,6 @@ 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
@@ -873,30 +857,33 @@ 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
 
+        # If we have a local annotated image but it's stored in the shared images folder
+        # (e.g. /outputs/images/...), copy it into this report's folder so the HTML/PDF
+        # can reference the image relative to the report directory. This also makes the
+        # image visible when opening report.html directly from disk (file://).
+        try:
+            if annotated_img_local:
+                annotated_img_local_abs = os.path.abspath(annotated_img_local)
+                report_dir_abs = os.path.abspath(report_dir)
+                # If the image is not already in the report directory, copy it there
+                if not os.path.commonpath([annotated_img_local_abs, report_dir_abs]) == report_dir_abs:
+                    src_basename = os.path.basename(annotated_img_local_abs)
+                    dest_name = f"annotated_{src_basename}"
+                    dest_path = os.path.join(report_dir, dest_name)
+                    try:
+                        shutil.copy2(annotated_img_local_abs, dest_path)
+                        annotated_img_local = dest_path
+                        annotated_img_full = f"/outputs/reports/{report_id}/{dest_name}"
+                    except Exception as e:
+                        # If copy fails, keep using the original annotated_img_full (may be served by StaticFiles)
+                        print(f"⚠️ Failed to copy annotated image into report folder: {e}")
+        except Exception:
+            pass
+
         # Now attempt to create the PDF (passing the local annotated image path
         # so the PDF writer can embed it). If annotation is remote or not
         # available, PDF creation will still proceed without the image.
@@ -984,9 +971,6 @@ 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
@@ -1084,7 +1068,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"' + annotated_img_width_attr + ' /></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" /></div>' if annotated_img else ''}
 
         <div class="full">
           <div class="section-title">Doctor\'s Notes</div>
@@ -1124,6 +1108,14 @@ async def generate_report(
         with open(report_html, "w", encoding="utf-8") as f:
             f.write(html_content)
 
+        # Update report.json to include the resolved annotated image url so callers can find it
+        try:
+            report_data['analysis']['annotated_image_url'] = annotated_img_full or ''
+            with open(report_json, 'w', encoding='utf-8') as f:
+                json.dump(report_data, f, indent=2, ensure_ascii=False)
+        except Exception as e:
+            print(f"⚠️ Failed to update report.json with annotated image url: {e}")
+
         return {
             "report_id": report_id,
             "json_url": json_url,