Spaces:

RockyBai
/

rise

Sleeping

App Files Files Community

RockyBai commited on Jan 7

Commit

78bff30

verified ·

1 Parent(s): 0558908

Update api.py

Browse files

Files changed (1) hide show

api.py +130 -68

api.py CHANGED Viewed

@@ -298,12 +298,93 @@ import requests
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 # --- BREVO (HTTP) CONFIG ---
 # HARDCODE YOUR KEY HERE AS REQUESTED
 BREVO_API_KEY = "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" # <--- PASTE YOUR KEY HERE INSIDE QUOTES
-def send_email_via_brevo(to_email: str, subject: str, body: str, is_html: bool = True):
-    """Sends email via Brevo HTTP API (Bypasses SMTP ports)."""
     if not BREVO_API_KEY or "xkeysib" not in BREVO_API_KEY:
         logger.warning("BREVO_API_KEY not set or invalid. Skipping HTTP email.")
         return False
@@ -322,6 +403,11 @@ def send_email_via_brevo(to_email: str, subject: str, body: str, is_html: bool =
         "htmlContent": body if is_html else f"<p>{body}</p>"
     }
     try:
         response = requests.post(url, json=payload, headers=headers, timeout=10)
         if response.status_code in [200, 201, 202]:
@@ -334,11 +420,11 @@ def send_email_via_brevo(to_email: str, subject: str, body: str, is_html: bool =
         logger.error(f"Brevo Request Failed: {e}")
         return False
-def send_email_helper(to_email: str, subject: str, body: str, is_html: bool = False):
     """Sends an email using Brevo (HTTP) first, falls back to Gmail SMTP."""
     # 1. Try Brevo (HTTP) - Preferred for HF Spaces
-    if send_email_via_brevo(to_email, subject, body, is_html):
         return True
     # 2. Fallback to SMTP (Gmail)
@@ -395,65 +481,23 @@ async def notify_status_endpoint(req: NotifyStatusRequest, background_tasks: Bac
     """
     subject = f"Arise Update: {req.issue_type} - {req.status.capitalize()}"
-    # Status Colors
-    color_map = {
-        "approved": "#10b981", # Green
-        "resolved": "#10b981", # Green
-        "rejected": "#ef4444", # Red
-        "inProgress": "#3b82f6", # Blue
-        "pending": "#eab308"   # Yellow
     }
-    status_color = color_map.get(req.status, "#6b7280")
-    # Construct HTML Body
-    html_body = f"""
-    <html>
-    <body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 20px;">
-        <div style="text-align: center; margin-bottom: 20px;">
-            <h2 style="color: #2563eb;">Arise Civic Report Update</h2>
-        </div>
-        <div style="background-color: #f9fafb; border-radius: 8px; padding: 20px; border: 1px solid #e5e7eb;">
-            <div style="margin-bottom: 20px; text-align: center;">
-                <span style="background-color: {status_color}; color: white; padding: 8px 16px; border-radius: 20px; font-weight: bold; text-transform: uppercase; font-size: 14px;">
-                    {req.status}
-                </span>
-            </div>
-            <p>Hello,</p>
-            <p>Your report has been updated. Here are the latest details:</p>
-            <table style="width: 100%; margin-bottom: 20px; border-collapse: collapse;">
-                <tr>
-                    <td style="padding: 8px; border-bottom: 1px solid #eee; color: #666;"><strong>Issue Type:</strong></td>
-                    <td style="padding: 8px; border-bottom: 1px solid #eee;">{req.issue_type}</td>
-                </tr>
-                <tr>
-                    <td style="padding: 8px; border-bottom: 1px solid #eee; color: #666;"><strong>Department:</strong></td>
-                    <td style="padding: 8px; border-bottom: 1px solid #eee;">{req.department}</td>
-                </tr>
-                <tr>
-                    <td style="padding: 8px; border-bottom: 1px solid #eee; color: #666;"><strong>Severity:</strong></td>
-                    <td style="padding: 8px; border-bottom: 1px solid #eee;">{req.severity}</td>
-                </tr>
-                <tr>
-                    <td style="padding: 8px; border-bottom: 1px solid #eee; color: #666;"><strong>Location:</strong></td>
-                    <td style="padding: 8px; border-bottom: 1px solid #eee;">{req.location or "Provided"}</td>
-                </tr>
-            </table>
-            {f'<div style="text-align: center; margin: 20px 0;"><img src="{req.imageUrl}" style="max-width: 100%; border-radius: 8px; box-shadow: 0 4px 6px rgba(0,0,0,0.1);" alt="Report Image"></div>' if req.imageUrl else ''}
-            <p style="margin-top: 20px;">
-                Thank you for contributing to a better community.
-            </p>
-            <p style="font-size: 12px; color: #999; text-align: center; margin-top: 30px;">
-                Sent via Arise AI System
-            </p>
-        </div>
-    </body>
-    </html>
-    """
     background_tasks.add_task(send_email_helper, req.user_email, subject, html_body, True)
     return {"status": "success", "message": "Notification queued"}
@@ -673,18 +717,36 @@ async def analyze_endpoint(
             if max_conf > 0.8:
                 # Auto-Approve -> Send to Dept
                 auto_status = "inProgress"
-                subject = f"Auto-Approved: High Confidence {primary_issue} Detected"
-                body = f"A new report has been auto-approved (Confidence: {int(max_conf*100)}%).\nIssue: {primary_issue}\nLocation: {lat}, {lon}\nDepartment: {department}\n\nPlease verify and resolve."
                 logger.info("Queuing email to admin (Auto-Approve)...")
-                background_tasks.add_task(send_email_helper, "rockybai8234@gmail.com", subject, body)
             else:
                 # Pending -> Send to Admin
-                subject = f"New Report Pending Review: {primary_issue}"
-                body = f"A new report requires manual review (Confidence: {int(max_conf*100)}%).\nIssue: {primary_issue}\n\nPlease check the admin dashboard."
                 logger.info("Queuing email to admin (Pending Review)...")
-                background_tasks.add_task(send_email_helper, "shivarajmani2005@gmail.com", subject, body)
         response_data = {
             "status": "Success",
@@ -728,4 +790,4 @@ async def analyze_endpoint(
         raise HTTPException(status_code=500, detail=str(e))
 if __name__ == "__main__":
-    uvicorn.run(app, host="0.0.0.0", port=7860)

 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
+# --- EMAIL TEMPLATE GENERATOR ---
+def generate_html_email(title: str, status: str, details: dict, image_url: str = None):
+    """
+    Generates a standardized, branded HTML email for Arise.
+    """
+    # Status Colors
+    color_map = {
+        "approved": "#10b981", # Green
+        "resolved": "#10b981", # Green
+        "rejected": "#ef4444", # Red
+        "inprogress": "#3b82f6", # Blue
+        "pending": "#eab308",  # Yellow
+        "auto-approved": "#8b5cf6" # Violet for Auto
+    }
+    status_key = status.lower().replace(" ", "")
+    status_color = color_map.get(status_key, "#6b7280")
+    # Build Details Table
+    rows = ""
+    for key, value in details.items():
+        rows += f"""
+        <tr>
+            <td style="padding: 12px; border-bottom: 1px solid #eee; color: #666; width: 40%;"><strong>{key}:</strong></td>
+            <td style="padding: 12px; border-bottom: 1px solid #eee; color: #333;">{value}</td>
+        </tr>
+        """
+    # Image Section (If URL provided, show it. If attachment only, the client shows attachment)
+    # Since we are attaching the image file directly in Brevo/SMTP, we might not need an <img> tag pointing to a URL
+    # unless we have a public URL.
+    # For now, we'll strip the inline image if no URL is passed (we rely on attachment).
+    image_html = ""
+    if image_url and image_url.startswith("http"):
+        image_html = f'<div style="text-align: center; margin: 20px 0;"><img src="{image_url}" style="max-width: 100%; border-radius: 8px; box-shadow: 0 4px 6px rgba(0,0,0,0.1);" alt="Report Image"></div>'
+    html_body = f"""
+    <html>
+    <body style="font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 0; background-color: #f4f4f5;">
+        <div style="background-color: #ffffff; border-radius: 12px; margin: 20px auto; overflow: hidden; box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);">
+            <!-- Header -->
+            <div style="background-color: #2563eb; padding: 24px; text-align: center;">
+                <h1 style="color: #ffffff; margin: 0; font-size: 24px;">{title}</h1>
+            </div>
+            <div style="padding: 32px;">
+                <!-- Status Badge -->
+                <div style="margin-bottom: 24px; text-align: center;">
+                    <span style="background-color: {status_color}; color: white; padding: 8px 16px; border-radius: 20px; font-weight: bold; text-transform: uppercase; font-size: 14px; letter-spacing: 1px;">
+                        {status}
+                    </span>
+                </div>
+                <p style="font-size: 16px; margin-bottom: 24px;">Hello,</p>
+                <p style="font-size: 16px; margin-bottom: 24px;">Here are the latest details regarding the report:</p>
+                <table style="width: 100%; margin-bottom: 24px; border-collapse: collapse; background-color: #f8fafc; border-radius: 8px; overflow: hidden;">
+                    {rows}
+                </table>
+                {image_html}
+                <p style="margin-top: 32px; border-top: 1px solid #e5e7eb; padding-top: 24px;">
+                    Thank you for contributing to a safer community.
+                </p>
+                <div style="margin-top: 16px; font-weight: bold; color: #2563eb;">
+                    Team Arise
+                </div>
+            </div>
+            <!-- Footer -->
+            <div style="background-color: #f1f5f9; padding: 16px; text-align: center; font-size: 12px; color: #94a3b8;">
+                &copy; {datetime.now().year} Arise Civic AI. All rights reserved.
+            </div>
+        </div>
+    </body>
+    </html>
+    """
+    return html_body
 # --- BREVO (HTTP) CONFIG ---
 # HARDCODE YOUR KEY HERE AS REQUESTED
 BREVO_API_KEY = "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" # <--- PASTE YOUR KEY HERE INSIDE QUOTES
+def send_email_via_brevo(to_email: str, subject: str, body: str, is_html: bool = True, attachment_base64: str = None):
+    """Sends email via Brevo HTTP API (Bypasses SMTP ports). Includes optional Base64 attachment."""
     if not BREVO_API_KEY or "xkeysib" not in BREVO_API_KEY:
         logger.warning("BREVO_API_KEY not set or invalid. Skipping HTTP email.")
         return False
         "htmlContent": body if is_html else f"<p>{body}</p>"
     }
+    if attachment_base64:
+        # Brevo expects: {"content": "BASE64...", "name": "filename.ext"}
+        payload["attachment"] = [{"content": attachment_base64, "name": "report_image.jpg"}]
     try:
         response = requests.post(url, json=payload, headers=headers, timeout=10)
         if response.status_code in [200, 201, 202]:
         logger.error(f"Brevo Request Failed: {e}")
         return False
+def send_email_helper(to_email: str, subject: str, body: str, is_html: bool = False, attachment_base64: str = None):
     """Sends an email using Brevo (HTTP) first, falls back to Gmail SMTP."""
     # 1. Try Brevo (HTTP) - Preferred for HF Spaces
+    if send_email_via_brevo(to_email, subject, body, is_html, attachment_base64):
         return True
     # 2. Fallback to SMTP (Gmail)
     """
     subject = f"Arise Update: {req.issue_type} - {req.status.capitalize()}"
+    details = {
+        "Issue Type": req.issue_type,
+        "Department": req.department,
+        "Severity": req.severity,
+        "Location": req.location or "Provided",
+        "Status Description": f"Your report has been marked as {req.status}. We will keep you updated."
     }
+    html_body = generate_html_email(
+        "Civic Report Update",
+        req.status,
+        details,
+        req.imageUrl
+    )
+    # If imageUrl is base64, we could parse it, but usually standard URLs are passed here from Cloudinary/etc.
+    # If the frontend passes a base64 string in imageUrl, we might want to handle it (but typically it's a URL).
     background_tasks.add_task(send_email_helper, req.user_email, subject, html_body, True)
     return {"status": "success", "message": "Notification queued"}
             if max_conf > 0.8:
                 # Auto-Approve -> Send to Dept
                 auto_status = "inProgress"
+                subject = f"Auto-Approved: High Confidence {primary_issue}"
+                details = {
+                    "Issue Type": primary_issue,
+                    "Confidence": f"{int(max_conf*100)}%",
+                    "Department": department,
+                    "Location": f"{lat}, {lon}",
+                    "Action": "Auto-Approved by AI"
+                }
+                html_body = generate_html_email("New Priority Report", "Auto-Approved", details)
                 logger.info("Queuing email to admin (Auto-Approve)...")
+                background_tasks.add_task(send_email_helper, "rockybai8234@gmail.com", subject, html_body, True, processed_image_base64)
             else:
                 # Pending -> Send to Admin
+                subject = f"Pending Review: {primary_issue}"
+                details = {
+                    "Issue Type": primary_issue,
+                    "Confidence": f"{int(max_conf*100)}%",
+                    "Department": department,
+                    "Location": f"{lat}, {lon}",
+                    "Action": "Waiting for Admin Verification"
+                }
+                html_body = generate_html_email("New Report Received", "Pending Review", details)
                 logger.info("Queuing email to admin (Pending Review)...")
+                background_tasks.add_task(send_email_helper, "shivarajmani2005@gmail.com", subject, html_body, True, processed_image_base64)
         response_data = {
             "status": "Success",
         raise HTTPException(status_code=500, detail=str(e))
 if __name__ == "__main__":
+    uvicorn.run(app, host="0.0.0.0", port=7860)