Update app.py

app.py

@@ -2,125 +2,145 @@ import gradio as gr
 from analyze_email_main import analyze
 from weasyprint import HTML
 import tempfile
+import re
+
 
 def html_to_pdf(html_content):
-    """Convert HTML string to a temporary PDF file and return its path."""
     with tempfile.NamedTemporaryFile(delete=False, suffix=".pdf") as tmp_pdf:
         HTML(string=html_content).write_pdf(tmp_pdf.name)
         return tmp_pdf.name
 
+
+def normalize_score(raw_score):
+    """
+    Accepts: int, float, '85', '85/100'
+    Returns: int 0–100
+    """
+    if isinstance(raw_score, (int, float)):
+        return max(0, min(int(raw_score), 100))
+
+    if isinstance(raw_score, str):
+        m = re.search(r"\d+", raw_score)
+        if m:
+            return max(0, min(int(m.group()), 100))
+
+    return 0
+
+
 def analyze_email(file_path):
     if file_path is None:
-        return "<p style='color:red;'>Please upload a .eml file to analyze.</p>", None
+        return "<p style='color:red;'>Please upload a .eml file.</p>", None
 
-    # Get structured results
     summary, details = analyze(file_path)
 
-    # Safely extract summary fields
-    attack_score = summary.get("Attack Score", 0)
-    try:
-        score_val = int(round(float(attack_score)))
-    except Exception:
-        score_val = 0
-    score_val = max(0, min(score_val, 100))
+    # 🔥 FIXED SCORE HANDLING
+    raw_score = summary.get("Attack Score", 0)
+    score_val = normalize_score(raw_score)
 
     attack_type = summary.get("Attack Type", "Unknown")
     verdict = summary.get("Final Verdict", "No Verdict")
 
     # Verdict color
     verdict_color = "#2ecc71"
-    v_lower = verdict.lower()
-    if "malicious" in v_lower:
+    v = verdict.lower()
+    if "malicious" in v:
         verdict_color = "#e74c3c"
-    elif "suspicious" in v_lower:
+    elif "suspicious" in v:
         verdict_color = "#e67e22"
-    elif "spam" in v_lower:
-        verdict_color = "#f1c40f"
 
-    # Collect details safely
     header_findings = details.get("Header Findings", []) or []
     body_findings = details.get("Body Findings", []) or []
     url_findings = details.get("URL Findings", []) or []
     highlighted_body = details.get("Highlighted Body", "") or ""
-    auth_results = details.get("Auth Results", None)
+    auth_results = details.get("Auth Results", {})
 
-    # Render authentication results safely
+    # Auth rendering
     if isinstance(auth_results, dict):
-        auth_html = "<ul>" + "".join(f"<li>{k.upper()}: {v}</li>" for k, v in auth_results.items()) + "</ul>"
-    elif isinstance(auth_results, str):
-        auth_html = f"<p>{auth_results}</p>"
+        auth_html = "<ul>" + "".join(
+            f"<li>{k.upper()}: {v}</li>" for k, v in auth_results.items()
+        ) + "</ul>"
     else:
-        auth_html = "<p>No auth results found.</p>"
+        auth_html = f"<p>{auth_results}</p>"
 
-    # Tags
-    main_tags_str = summary.get("Main Tags", "")
-    tags = [t.strip() for t in main_tags_str.split(",")] if main_tags_str else []
+    tags = [
+        t.strip()
+        for t in (summary.get("Main Tags") or "").split(",")
+        if t.strip()
+    ]
+
+    # 🔥 DARK MODE SAFE BODY
+    body_bg = "#fdfdfd"
+    body_fg = "#000000"
 
-    # HTML Report
     html = f"""
-    <div style='font-family: Arial, sans-serif; padding: 20px; max-width: 900px; margin:auto;'>
-      <h2 style="color:#2c3e50;">📧 Email Security Report</h2>
-      <h3 style="margin-bottom:6px;">Attack Score</h3>
-      <div style="background:#ecf0f1; border-radius:10px; overflow:hidden; height:24px; width:100%; margin-bottom:8px;">
-        <div style="width:{score_val}%; background:#3498db; height:100%; text-align:center; color:white; line-height:24px;">
+    <div style="font-family:Arial; max-width:900px; margin:auto; padding:20px;">
+      <h2>📧 Email Security Report</h2>
+
+      <h3>Attack Score</h3>
+      <div style="background:#e0e0e0; border-radius:10px; height:24px;">
+        <div style="width:{score_val}%; background:#3498db; height:100%;
+                    border-radius:10px; color:white; text-align:center;
+                    line-height:24px;">
           {score_val}/100
         </div>
       </div>
-      <p><b>Attack Type:</b> {attack_type}</p>
-      <p><b>Final Verdict:</b> <span style="background:{verdict_color}; color:white; padding:4px 10px; border-radius:6px;">
-        {verdict}
-      </span></p>
 
-      <details style="margin-top:15px;" open>
+      <p><b>Attack Type:</b> {attack_type}</p>
+      <p><b>Final Verdict:</b>
+        <span style="background:{verdict_color}; color:white;
+                     padding:4px 10px; border-radius:6px;">
+          {verdict}
+        </span>
+      </p>
+
+      <details open>
         <summary>🔖 Attack Analysis Tags ({len(tags)})</summary>
-        {"<ul>" + "".join(f"<li>{tag}</li>" for tag in tags if tag) + "</ul>" if tags else "<p>No special tags</p>"}
+        {"<ul>" + "".join(f"<li>{t}</li>" for t in tags) + "</ul>" if tags else "<p>None</p>"}
       </details>
 
-      <details style="margin-top:15px;" open>
+      <details open>
         <summary>🛡 Authentication Results</summary>
         {auth_html}
       </details>
 
-      <details style="margin-top:15px;" open>
+      <details open>
         <summary>🕵️ Detailed Findings</summary>
-        <h4>Headers ({len(header_findings)})</h4>
-        {"<ul>" + "".join(f"<li>{f}</li>" for f in header_findings) + "</ul>" if header_findings else "<p>No header findings.</p>"}
-        <h4>Body ({len(body_findings)})</h4>
-        {"<ul>" + "".join(f"<li>{f}</li>" for f in body_findings) + "</ul>" if body_findings else "<p>No body findings.</p>"}
-        <h4>URLs ({len(url_findings)})</h4>
-        {"<ul>" + "".join(f"<li>{f}</li>" for f in url_findings) + "</ul>" if url_findings else "<p>No URL findings.</p>"}
+        <h4>Headers</h4>
+        {"<ul>" + "".join(f"<li>{f}</li>" for f in header_findings) + "</ul>"}
+        <h4>Body</h4>
+        {"<ul>" + "".join(f"<li>{f}</li>" for f in body_findings) + "</ul>"}
+        <h4>URLs</h4>
+        {"<ul>" + "".join(f"<li>{f}</li>" for f in url_findings) + "</ul>"}
       </details>
 
-      <details style="margin-top:15px;">
+      <details>
         <summary>📩 Highlighted Email Body</summary>
-        <div style='border:1px solid #ccc; padding:15px; background:#fdfdfd; border-radius:8px; white-space:pre-wrap;'>
+        <div style="background:{body_bg}; color:{body_fg};
+                    padding:15px; border-radius:8px;
+                    white-space:pre-wrap;">
           {highlighted_body}
         </div>
       </details>
     </div>
     """
 
-    # ALWAYS generate PDF
     try:
         pdf_path = html_to_pdf(html)
-    except Exception as e:
+    except Exception:
         pdf_path = None
-        html += f"<p style='color:#c0392b;'><b>PDF export failed:</b> {e}</p>"
 
     return html, pdf_path
 
-# Gradio Interface (checkbox removed)
+
 demo = gr.Interface(
     fn=analyze_email,
-    inputs=[
-        gr.File(label="Upload .eml File", type="filepath")
-    ],
+    inputs=gr.File(label="Upload .eml File", type="filepath"),
     outputs=[
         gr.HTML(label="Analysis Report"),
-        gr.File(label="Download PDF Report")
+        gr.File(label="Download PDF Report"),
     ],
     title="📧 Email Security Analyzer",
-    description="Upload an .eml file to detect phishing, spam, or malicious emails. A PDF report will be generated automatically."
+    description="Upload an .eml file to analyze threats."
 )
 
 demo.launch()