From c95a1c456b0b118489c5be005e2448ec255d4935 Mon Sep 17 00:00:00 2001
From: Kobe <kobeamerijckx@outlook.com>
Date: Mon, 2 Jun 2025 14:55:50 +0200
Subject: [PATCH] sending email async with celery

---
 __pycache__/app.cpython-313.pyc               | Bin 5740 -> 6001 bytes
 __pycache__/celery_worker.cpython-313.pyc     | Bin 0 -> 2586 bytes
 app.py                                        |  29 +++++-
 celery_worker.py                              |  51 +++++++++++
 docker-compose.yml                            |  49 ++++++++++
 entrypoint.sh                                 |   8 ++
 requirements.txt                              |  23 +++--
 .../__pycache__/notification.cpython-313.pyc  | Bin 14952 -> 15854 bytes
 utils/notification.py                         |  84 ++++++++++--------
 9 files changed, 195 insertions(+), 49 deletions(-)
 create mode 100644 __pycache__/celery_worker.cpython-313.pyc
 create mode 100644 celery_worker.py

diff --git a/__pycache__/app.cpython-313.pyc b/__pycache__/app.cpython-313.pyc
index 5b5c1860ca22815010cd714ca95b0e67ea6dc2c8..22801aee25b63871ce1df59a2a6b9e835275adc0 100644
GIT binary patch
delta 1391
zcmah}&2Jk;6rb7kuGe0F#vgIrBwl~SuAym66DM)fptOwxiA_Ux8@0$0u1VIZsbjli
zN2ooNA|U~ldWhywRFL=^s{R4(rJzb2Ks``a;#eUBLJ1!iPP}ol*homs;WuyI`@J{s
zy?ML8oIE(?`rYZYBUqO{o4;Ce?YTm@xR-izT0@$<psYkmR6!fo7|JpZECp$vFe0&y
zSWidd8*z1+Ugv!&Zx$c&w1MzHK4f$wsrhCvBUJGq1l(1|b^5hH4l8IIZ{u{3*6|B>
z8XI!0QR|d9^}0@O&^0b7?pqLgTcSH$1WWWTHwGBx1N0kCI+A|nPIsj@0GoUiaF2h@
zwDHM7$xKN>rNCiw2wjxu%a$y#DwebHe#UT*Vfr;Nu%o=6QzP_&#qZEunmflS5JOd1
zAv7#Fra5*peS7=5G>J8D7`-c*4Q%kGplMfQ%zvz}RSk>g)BJ^j6<b44(7F(VTg*JV
zH>T)4VOS1m!J`aP^pP<1zSgHOgZK8*NmKqG-YJv!uPZaAwzsPjJsBi=ix;UX4u+r!
z|H)=$=8l<BwQz4X8rIUJ84J9pOu4tKGtAp|JOwIX%+V{(u*kt6mgebKVjSM^XK`4T
z5@?=}pejxeQJ?k4rJEt5Z`Inf<Ky+_W~F|$+3w6vO-$#;GilE7p3fKa>RaV=>S`gc
zme<vy5jaw*d2PLTv3&0A`9l7}BK^zy1ZU`DDTL$nd+Aar3Q3R?05Gb2rPXS)alcIx
z^mSVnPtseq<3PM``y40ew0#WcsBVwp_`{Fw4lKu*Z=6Abej(>^p1zPHU=$n+9G;^~
zuGa7vSPfgXR`2Mf{LT$SsMbikLs(bHG=1he193g>30$Cy?)!2#mJ4j@2>r=Dgilb>
zqu>de@{Bl%kA)I<TU(WmPV=5SS8RrLr?yStXo!d37a3)7Ut;hI1NNw7hCz`*8lY_h
zP>$9DNx;dlZxS7%l%af50R<c9_7F#t-mf!%h{$#9Q{OY^@a?625ed>qD<7<UX9;|3
z2|N!^J|CIc7myG<K)fLC+mUE{_@_68<)>bGImtgw+LyC5<$E+5X4g1cqzRqS%dOgG
zJ1r3S4<NG2V2y!FW&g-vHzB!?NvdGHMi=}Uc!=x%5H#hEe-5wGFa4k3Df(t$>9XNG
zEWi9-lU&nDw^Q9hx)mD&Y3@S%SsZc!z~ISlgY-Qf(@AG`np?Yd{Z(=kj%*0pcc~GW
c8~6c@9*77#K6L(OS;N?UP^F3BqJ=%x-?IM>;Q#;t

delta 1353
zcmah}PfQb87=K@9h8fzSQ=o&uik<RDEFvWq;vz~g5hF-;Ne80|jgyL{)<E050?Q_9
zJ$P6-t@&=sb@#j*J?UZhVxq|&*6YLr@lUvHLRe0F*u?L(4y}pVeaZXY@B2I7`@Q#O
zZ|JYV;C@q+pV2rzbN1$3)5BmpOg`*?QBJAdY*g53Sj;v$8Mjha&BmjtXmYCRua|ac
z6so%2+<8!e_oRC5meW@mONSVv%uDq-pW<8X@EBMu3t5PPi5u|Y@M3*f11S>C{hwvV
zuBrHgF9IqCr6|7g>4diBu-}&YDZ-ZLD=KPIqUyjoX^haO6#b<Ce&EsMezFbACdmu(
zD9PLMxw7hQ!(#Jl@^F10Rcr@q+snh3V=k*BAgH^gc~s_o3vFJl<Pi_mRy$O!io=Rh
zmh5J`<x*&-F)v%}vfNFbeAZP@Ezd&>y&kd!oxV!<Uy3{W|8e+CG0Oj4Wx%WQSzm*m
zwYDbXHS8hV^s?->IxZFB@}Pq51v8e6<MoDtiG^X$L~$oQTw9YPHS8g~L);3AKZUv)
zfiWCZd+40!)UJTq%g#y>wgj<G+)#J$C+$V2;HG4dxX0cbty^~<mtPz4Keafw@P6Z!
zc5!UHk3<YyDP1g<#D%}dqqyHV3IiDPe+3p!`L`g7Z~Z4Aj-fy|SWglG9Rd-NYY7p>
z8GQ=I@kc#E&R_INAAF5_!D5%-)NNeKEw5&{bNzc)S<3O!Do=={5xi@hp}NnF1f0WN
z<I%B7tswbgU0gg4S96?vdL`pHuCGvX8?u?zOn#mB;jbYpBB<kv5cCR}>t8Npb9rYy
zm-&u2lL7w?ZC=q_btRYOY5ID%h!o86At5T+;v(~DAu23sgskeA<WW*w|02&&vO~o1
z6d6pKrCq?C=0BuuMSJqDr5^$>2Lsa}y#oJq2+i<seH|iGFY*FyJL42{i=~*t>6J4+
zE5tWKe2f2tj~uFeBTyH~)8tI!kU31OJ7zl^#SL>DX7Q={01`OScHw-bk4nF;!V7D(
zGm*o^KggB%TAtUPim+*CRth)PmNOH4l~kZv+Qc_)<HlYC1O0x}-||HOV{aZ~htAW>
GWb7j?yW!{n

diff --git a/__pycache__/celery_worker.cpython-313.pyc b/__pycache__/celery_worker.cpython-313.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6e95e30b654d820cfa786d4e3eab1a71203c1344
GIT binary patch
literal 2586
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

literal 0
HcmV?d00001

diff --git a/app.py b/app.py
index 14980b1..dd0fa74 100644
--- a/app.py
+++ b/app.py
@@ -1,5 +1,5 @@
 import random
-from flask import Flask, send_from_directory
+from flask import Flask, send_from_directory, jsonify
 from flask_migrate import Migrate
 from dotenv import load_dotenv
 import os
@@ -14,6 +14,7 @@ import click
 from utils import timeago
 from extensions import db, login_manager, csrf
 from utils.email_templates import create_default_templates
+from celery_worker import init_celery, celery
 
 # Load environment variables
 load_dotenv()
@@ -35,6 +36,9 @@ def create_app():
     login_manager.login_view = 'auth.login'
     csrf.init_app(app)
 
+    # Initialize Celery
+    init_celery(app)
+
     @app.context_processor
     def inject_csrf_token():
         return dict(csrf_token=generate_csrf())
@@ -48,13 +52,32 @@ def create_app():
     def load_user(user_id):
         return User.query.get(int(user_id))
 
+    # Health check endpoint
+    @app.route('/health')
+    def health_check():
+        try:
+            # Check database connection
+            db.session.execute('SELECT 1')
+            # Check Redis connection
+            celery.control.inspect().ping()
+            return jsonify({
+                'status': 'healthy',
+                'database': 'connected',
+                'redis': 'connected'
+            }), 200
+        except Exception as e:
+            return jsonify({
+                'status': 'unhealthy',
+                'error': str(e)
+            }), 500
+
     # Initialize routes
     from routes import init_app
     init_app(app)
     app.register_blueprint(room_files_bp, url_prefix='/api/rooms')
+    app.register_blueprint(user_bp, url_prefix='/api/users')
     app.register_blueprint(room_members_bp, url_prefix='/api/rooms')
-    app.register_blueprint(trash_bp, url_prefix='/api/rooms')
-    app.register_blueprint(user_bp)
+    app.register_blueprint(trash_bp, url_prefix='/api/trash')
 
     @app.cli.command("cleanup-trash")
     def cleanup_trash_command():
diff --git a/celery_worker.py b/celery_worker.py
new file mode 100644
index 0000000..9baafef
--- /dev/null
+++ b/celery_worker.py
@@ -0,0 +1,51 @@
+from celery import Celery
+from flask import current_app
+import os
+import logging
+
+# Configure logging
+logger = logging.getLogger(__name__)
+
+# Get Redis URL from environment variable or use default
+REDIS_URL = os.getenv('REDIS_URL', 'redis://localhost:6379/0')
+
+# Configure Celery
+celery = Celery(
+    'docupulse',
+    backend=REDIS_URL,
+    broker=REDIS_URL,
+    # Add some default configuration
+    task_serializer='json',
+    accept_content=['json'],
+    result_serializer='json',
+    timezone='UTC',
+    enable_utc=True,
+    # Add retry configuration
+    task_acks_late=True,
+    task_reject_on_worker_lost=True,
+    task_default_retry_delay=300,  # 5 minutes
+    task_max_retries=3
+)
+
+def init_celery(app):
+    """Initialize Celery with Flask app context"""
+    celery.conf.update(app.config)
+
+    class ContextTask(celery.Task):
+        """Celery task that runs within Flask app context"""
+        def __call__(self, *args, **kwargs):
+            with app.app_context():
+                return self.run(*args, **kwargs)
+
+        def on_failure(self, exc, task_id, args, kwargs, einfo):
+            """Handle task failure"""
+            logger.error(f'Task {task_id} failed: {exc}')
+            super().on_failure(exc, task_id, args, kwargs, einfo)
+
+        def on_retry(self, exc, task_id, args, kwargs, einfo):
+            """Handle task retry"""
+            logger.warning(f'Task {task_id} is being retried: {exc}')
+            super().on_retry(exc, task_id, args, kwargs, einfo)
+
+    celery.Task = ContextTask
+    return celery 
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index b463db0..d01c748 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,11 +12,18 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
       - POSTGRES_DB=docupulse
+      - REDIS_URL=redis://redis:6379/0
     volumes:
       - uploads:/app/uploads
     depends_on:
       - db
+      - redis
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:5000/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
     deploy:
       resources:
         limits:
@@ -32,6 +39,48 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  redis:
+    image: redis:7
+    ports:
+      - "6379:6379"
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  celery_worker:
+    build: .
+    command: celery -A celery_worker.celery worker --loglevel=info
+    environment:
+      - FLASK_APP=app.py
+      - FLASK_ENV=production
+      - DATABASE_URL=postgresql://postgres:postgres@db:5432/docupulse
+      - REDIS_URL=redis://redis:6379/0
+    volumes:
+      - .:/app
+    depends_on:
+      - web
+      - redis
+      - db
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "celery", "-A", "celery_worker.celery", "inspect", "ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    deploy:
+      resources:
+        limits:
+          cpus: '0.5'
+          memory: 512M
 
 volumes:
   postgres_data:
diff --git a/entrypoint.sh b/entrypoint.sh
index 2e6b99b..83aaf1e 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -6,6 +6,7 @@ echo "POSTGRES_USER: $POSTGRES_USER"
 echo "POSTGRES_PASSWORD: $POSTGRES_PASSWORD"
 echo "POSTGRES_DB: $POSTGRES_DB"
 echo "DATABASE_URL: $DATABASE_URL"
+echo "REDIS_URL: $REDIS_URL"
 
 # Wait for the database to be ready
 echo "Waiting for database to be ready..."
@@ -14,6 +15,13 @@ while ! nc -z db 5432; do
 done
 echo "Database is ready!"
 
+# Wait for Redis to be ready
+echo "Waiting for Redis to be ready..."
+while ! nc -z redis 6379; do
+  sleep 0.1
+done
+echo "Redis is ready!"
+
 # Wait for PostgreSQL to be ready to accept connections
 echo "Waiting for PostgreSQL to accept connections..."
 until PGPASSWORD=$POSTGRES_PASSWORD psql -h db -U $POSTGRES_USER -d $POSTGRES_DB -c '\q'; do
diff --git a/requirements.txt b/requirements.txt
index e5572b5..63bbdd7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,17 @@
-Flask==3.0.2
-Flask-SQLAlchemy==3.1.1
-Flask-Login==0.6.3
-Flask-WTF==1.2.1
-Flask-Migrate==4.0.5
-SQLAlchemy==2.0.23
-Werkzeug==3.0.1
+Flask>=2.0.0
+Flask-SQLAlchemy>=3.0.0
+Flask-Login>=0.6.0
+Flask-WTF>=1.0.0
+Flask-Migrate>=4.0.0
+SQLAlchemy>=1.4.0
+Werkzeug>=2.0.0
 WTForms==3.1.1
-python-dotenv==1.0.1
+python-dotenv>=0.19.0
 psycopg2-binary==2.9.9
 gunicorn==21.2.0
-email_validator==2.1.0.post1 
\ No newline at end of file
+email_validator==2.1.0.post1
+celery>=5.3.0
+redis>=4.5.0
+alembic>=1.7.0
+flower>=2.0.0
+prometheus-client>=0.16.0 
\ No newline at end of file
diff --git a/utils/__pycache__/notification.cpython-313.pyc b/utils/__pycache__/notification.cpython-313.pyc
index b711e82abf541be34aeb8a661ffaadde6bad0cc2..c6b6d5d9249d1dd8cec3bd2846f1e91d1d2c5920 100644
GIT binary patch
delta 4313
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

delta 3893
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

diff --git a/utils/notification.py b/utils/notification.py
index aa41a9d..20e7846 100644
--- a/utils/notification.py
+++ b/utils/notification.py
@@ -1,14 +1,16 @@
 from flask import request
-from models import Notif, NotifType, db, EmailTemplate, Mail, KeyValueSettings
+from models import Notif, NotifType, db, EmailTemplate, Mail, KeyValueSettings, User
 from typing import Optional, Dict, Any, List
 from datetime import datetime, timedelta
 from flask_login import current_user
-from sqlalchemy import desc
+from sqlalchemy import desc, and_
 import logging
 import smtplib
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
+from email.utils import formatdate
 import json
+from celery_worker import celery
 
 logger = logging.getLogger(__name__)
 
@@ -29,57 +31,65 @@ def get_smtp_settings() -> Optional[Dict[str, Any]]:
         logger.error(f"Error retrieving SMTP settings: {str(e)}")
         return None
 
-def send_email_via_smtp(mail: Mail) -> bool:
-    """
-    Send an email using the configured SMTP settings.
-    
-    Args:
-        mail: The Mail object containing the email details
-    
-    Returns:
-        bool: True if email was sent successfully, False otherwise
-    """
-    smtp_settings = get_smtp_settings()
-    if not smtp_settings:
-        logger.error("Cannot send email: SMTP settings not configured")
-        return False
-
+@celery.task
+def send_email_task(mail_id: int):
+    """Celery task to send an email asynchronously"""
     try:
+        # Get the mail record
+        mail = Mail.query.get(mail_id)
+        if not mail:
+            logger.error(f"Mail record not found for ID: {mail_id}")
+            return False
+
+        # Get SMTP settings
+        smtp_settings = get_smtp_settings()
+        if not smtp_settings:
+            logger.error("SMTP settings not found")
+            mail.status = 'failed'
+            mail.error_message = "SMTP settings not found"
+            db.session.commit()
+            return False
+
         # Create message
         msg = MIMEMultipart()
-        msg['From'] = f"{smtp_settings['smtp_from_name']} <{smtp_settings['smtp_from_email']}>"
-        msg['To'] = mail.recipient
+        msg['From'] = smtp_settings.sender_email
+        msg['To'] = mail.recipient_email
         msg['Subject'] = mail.subject
+        msg['Date'] = formatdate(localtime=True)
 
-        # Attach HTML body
-        msg.attach(MIMEText(mail.body, 'html'))
-
-        # Create SMTP connection
-        if smtp_settings['smtp_security'] == 'ssl':
-            server = smtplib.SMTP_SSL(smtp_settings['smtp_host'], int(smtp_settings['smtp_port']))
-        else:
-            server = smtplib.SMTP(smtp_settings['smtp_host'], int(smtp_settings['smtp_port']))
-            if smtp_settings['smtp_security'] == 'tls':
-                server.starttls()
-
-        # Login if credentials are provided
-        if smtp_settings['smtp_username'] and smtp_settings['smtp_password']:
-            server.login(smtp_settings['smtp_username'], smtp_settings['smtp_password'])
+        # Add HTML content
+        msg.attach(MIMEText(mail.content, 'html'))
 
         # Send email
-        server.send_message(msg)
-        server.quit()
+        with smtplib.SMTP(smtp_settings.smtp_server, smtp_settings.smtp_port) as server:
+            if smtp_settings.use_tls:
+                server.starttls()
+            if smtp_settings.username and smtp_settings.password:
+                server.login(smtp_settings.username, smtp_settings.password)
+            server.send_message(msg)
 
         # Update mail status
         mail.status = 'sent'
         mail.sent_at = datetime.utcnow()
         db.session.commit()
-
-        logger.info(f"Email sent successfully to {mail.recipient}")
         return True
 
     except Exception as e:
         logger.error(f"Error sending email: {str(e)}")
+        if mail:
+            mail.status = 'failed'
+            mail.error_message = str(e)
+            db.session.commit()
+        return False
+
+def send_email_via_smtp(mail: Mail) -> bool:
+    """Queue an email to be sent asynchronously"""
+    try:
+        # Queue the email sending task
+        send_email_task.delay(mail.id)
+        return True
+    except Exception as e:
+        logger.error(f"Error queueing email: {str(e)}")
         mail.status = 'failed'
         mail.error_message = str(e)
         db.session.commit()