Spaces:

rairo
/

guards-api

Sleeping

App Files Files Community

rairo commited on Aug 15, 2025

Commit

600d444

verified ·

1 Parent(s): be1c27e

Update main.py

Browse files

Files changed (1) hide show

main.py +34 -21

main.py CHANGED Viewed

@@ -21,7 +21,7 @@ import base64
 # --- NEW IMPORTS FOR FILE GENERATION ---
 import weasyprint
-import imgkit
 # === Logging Configuration ===
 if not os.path.exists('logs'):
@@ -72,8 +72,7 @@ logger.info("Flask and APScheduler initialized.")
 # === UPDATED EMAIL SENDING FUNCTION ===
 def send_email(to, subject, html, attachments=None):
     """
-    Sends an email using a direct requests call, now with attachment support.
-    Attachments should be a list of dicts: [{'filename': 'roster.pdf', 'content': 'base64_string'}]
     """
     if not RESEND_API_KEY:
         logger.error("RESEND_API_KEY is not configured. Cannot send email.")
@@ -85,7 +84,7 @@ def send_email(to, subject, html, attachments=None):
         "Content-Type": "application/json"
     }
     payload = {
-        "from": "Guard Admin <admin@sozofix.tech>", # Using custom domain
         "to": to.strip(),
         "subject": subject,
         "html": html,
@@ -95,7 +94,7 @@ def send_email(to, subject, html, attachments=None):
     try:
         response = requests.post(
             url, headers=headers, json=payload,
-            verify=certifi.where(), timeout=30 # Increased timeout for attachments
         )
         response.raise_for_status()
         response_data = response.json()
@@ -139,17 +138,35 @@ def create_pdf_attachment(html_content, filename):
         logger.error(f"Failed to create PDF attachment: {e}", exc_info=True)
         return None
 def create_image_attachment(html_content, filename):
-    """Creates a PNG image file from HTML content and returns its path."""
     try:
         filepath = f"/tmp/{filename}"
-        # Options to improve image quality and ensure full capture
-        options = {'width': 800, 'disable-smart-width': ''}
-        imgkit.from_string(html_content, filepath, options=options)
-        logger.info(f"Successfully created image attachment: {filepath}")
         return filepath
     except Exception as e:
-        logger.error(f"Failed to create image attachment: {e}", exc_info=True)
         return None
@@ -172,13 +189,13 @@ def send_rotation_notification(job_id, shift_record):
     except Exception:
         human_readable_time = shift_record.get('assigned_at', 'Unknown')
-    # Generate HTML content once
     html_content = f"""
     <html><head><style>
-        body {{ font-family: sans-serif; }}
-        table {{ border-collapse: collapse; width: 100%; }}
-        th, td {{ border: 1px solid #dddddd; text-align: left; padding: 8px; }}
         th {{ background-color: #f2f2f2; }}
     </style></head><body>
     <h2>Guard Rotation Notification</h2>
     <p><strong>Job:</strong> {job_name}</p>
@@ -193,18 +210,15 @@ def send_rotation_notification(job_id, shift_record):
         html_content += f"<tr><td>{point_name}</td><td>{members_html}</td></tr>"
     html_content += "</tbody></table><p><em>This is an automated notification from the Guard Rotation System.</em></p></body></html>"
-    # Generate Attachments
     base_filename = f"roster_{job_name.replace(' ', '_')}_shift_{shift_number}_{int(time.time())}"
     paths_to_clean = []
     attachments = []
     try:
-        # Create files
         csv_path = create_csv_attachment(shift_record, f"{base_filename}.csv")
         pdf_path = create_pdf_attachment(html_content, f"{base_filename}.pdf")
         img_path = create_image_attachment(html_content, f"{base_filename}.png")
-        # Prepare for email sending
         file_paths = {'roster.csv': csv_path, 'roster.pdf': pdf_path, 'roster.png': img_path}
         for filename, filepath in file_paths.items():
             if filepath:
@@ -213,7 +227,6 @@ def send_rotation_notification(job_id, shift_record):
                     content_b64 = base64.b64encode(f.read()).decode('utf-8')
                     attachments.append({'filename': filename, 'content': content_b64})
-        # Send emails
         subject = f"Guard Rotation - {job_name} (Shift {shift_number})"
         for send_to_email in SEND_TO_EMAILS:
             logger.info(f"Sending rotation notification with {len(attachments)} attachments to {send_to_email}...")
@@ -221,7 +234,6 @@ def send_rotation_notification(job_id, shift_record):
             time.sleep(1)
     finally:
-        # CRITICAL: Clean up temporary files
         logger.info(f"Cleaning up {len(paths_to_clean)} temporary files...")
         for path in paths_to_clean:
             try:
@@ -370,7 +382,8 @@ def update_job(job_id):
 @app.route("/schedule_job/<job_id>", methods=["POST"])
 def schedule_job(job_id):
     if not verify_token(request): return jsonify({"error": "Unauthorized"}), 401
-    data, start_time_iso = request.json, data.get("start_time")
     if not start_time_iso: return jsonify({"error": "start_time is required"}), 400
     job_ref = db.reference(f"jobs/{job_id}")
     if not job_ref.get(): return jsonify({"error": "Job not found"}), 404

 # --- NEW IMPORTS FOR FILE GENERATION ---
 import weasyprint
+import fitz  # PyMuPDF
 # === Logging Configuration ===
 if not os.path.exists('logs'):
 # === UPDATED EMAIL SENDING FUNCTION ===
 def send_email(to, subject, html, attachments=None):
     """
+    Sends an email using a direct requests call, with attachment support.
     """
     if not RESEND_API_KEY:
         logger.error("RESEND_API_KEY is not configured. Cannot send email.")
         "Content-Type": "application/json"
     }
     payload = {
+        "from": "Guard Admin <admin@sozofix.tech>",
         "to": to.strip(),
         "subject": subject,
         "html": html,
     try:
         response = requests.post(
             url, headers=headers, json=payload,
+            verify=certifi.where(), timeout=30
         )
         response.raise_for_status()
         response_data = response.json()
         logger.error(f"Failed to create PDF attachment: {e}", exc_info=True)
         return None
+# --- DEFINITIVELY FIXED IMAGE GENERATION ---
 def create_image_attachment(html_content, filename):
+    """
+    Creates a PNG image by first rendering HTML to an in-memory PDF,
+    then converting that PDF to a high-quality image using PyMuPDF.
+    This method has no external command-line dependencies.
+    """
     try:
         filepath = f"/tmp/{filename}"
+        # Step 1: Render HTML to a PDF in memory
+        pdf_bytes = weasyprint.HTML(string=html_content).write_pdf()
+        # Step 2: Use PyMuPDF (fitz) to open the in-memory PDF
+        pdf_doc = fitz.open(stream=pdf_bytes, filetype="pdf")
+        # Step 3: Get the first page
+        page = pdf_doc[0]
+        # Step 4: Render the page to a pixmap (image). Increase DPI for better quality.
+        pix = page.get_pixmap(dpi=150)
+        # Step 5: Save the pixmap as a PNG file
+        pix.save(filepath)
+        logger.info(f"Successfully created image attachment via PDF conversion: {filepath}")
         return filepath
     except Exception as e:
+        logger.error(f"Failed to create image attachment using PyMuPDF: {e}", exc_info=True)
         return None
     except Exception:
         human_readable_time = shift_record.get('assigned_at', 'Unknown')
     html_content = f"""
     <html><head><style>
+        body {{ font-family: sans-serif; color: #333; }}
+        table {{ border-collapse: collapse; width: 100%; margin-top: 20px; }}
+        th, td {{ border: 1px solid #dddddd; text-align: left; padding: 12px; }}
         th {{ background-color: #f2f2f2; }}
+        h2, h3 {{ color: #1a1a1a; }}
     </style></head><body>
     <h2>Guard Rotation Notification</h2>
     <p><strong>Job:</strong> {job_name}</p>
         html_content += f"<tr><td>{point_name}</td><td>{members_html}</td></tr>"
     html_content += "</tbody></table><p><em>This is an automated notification from the Guard Rotation System.</em></p></body></html>"
     base_filename = f"roster_{job_name.replace(' ', '_')}_shift_{shift_number}_{int(time.time())}"
     paths_to_clean = []
     attachments = []
     try:
         csv_path = create_csv_attachment(shift_record, f"{base_filename}.csv")
         pdf_path = create_pdf_attachment(html_content, f"{base_filename}.pdf")
         img_path = create_image_attachment(html_content, f"{base_filename}.png")
         file_paths = {'roster.csv': csv_path, 'roster.pdf': pdf_path, 'roster.png': img_path}
         for filename, filepath in file_paths.items():
             if filepath:
                     content_b64 = base64.b64encode(f.read()).decode('utf-8')
                     attachments.append({'filename': filename, 'content': content_b64})
         subject = f"Guard Rotation - {job_name} (Shift {shift_number})"
         for send_to_email in SEND_TO_EMAILS:
             logger.info(f"Sending rotation notification with {len(attachments)} attachments to {send_to_email}...")
             time.sleep(1)
     finally:
         logger.info(f"Cleaning up {len(paths_to_clean)} temporary files...")
         for path in paths_to_clean:
             try:
 @app.route("/schedule_job/<job_id>", methods=["POST"])
 def schedule_job(job_id):
     if not verify_token(request): return jsonify({"error": "Unauthorized"}), 401
+    data = request.json
+    start_time_iso = data.get("start_time")
     if not start_time_iso: return jsonify({"error": "start_time is required"}), 400
     job_ref = db.reference(f"jobs/{job_id}")
     if not job_ref.get(): return jsonify({"error": "Job not found"}), 404