Update app.py

app.py

@@ -2,22 +2,20 @@ import os
 import re
 import uuid
 import pytz
-import smtplib
 import psycopg2
 import requests
 import gradio as gr
 import json
 import pickle
+import base64
+
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
-from google_auth_oauthlib.flow import InstalledAppFlow
 from googleapiclient.discovery import build
-import base64
+
 from email.mime.text import MIMEText
-from email.mime.multipart import MIMEMultipart
 from datetime import datetime, date
 from dotenv import load_dotenv
-from urllib.parse import parse_qs
 
 
 # ================= LOAD ENV =================
@@ -26,12 +24,14 @@ load_dotenv()
 
 DB_URL = os.getenv("DB_URL")
 GMAIL_USER = os.getenv("GMAIL_USER")
-GMAIL_APP_PASSWORD = os.getenv("GMAIL_APP_PASSWORD")
 CRON_SECRET = os.getenv("CRON")
 HF_URL = os.getenv("HF_URL")
 
 LEETCODE_API = "https://leetcode-api-vercel.vercel.app"
 
+SCOPES = ["https://www.googleapis.com/auth/gmail.send"]
+TOKEN_FILE = "token.pkl"
+
 
 # ================= DB =================
 
@@ -39,61 +39,40 @@ def get_db():
     return psycopg2.connect(DB_URL, sslmode="require")
 
 
-SCOPES = ["https://www.googleapis.com/auth/gmail.send"]
-TOKEN_FILE = "token.pkl"
-
+# ================= GMAIL AUTH =================
 
 def get_gmail_service():
-    """
-    Get authenticated Gmail API service.
-    Uses token.pkl if available.
-    Recreates if expired using credentials from ENV.
-    """
 
     creds = None
 
-    # ---- Load cached token ----
+    # Load token
     if os.path.exists(TOKEN_FILE):
         try:
             with open(TOKEN_FILE, "rb") as f:
                 creds = pickle.load(f)
-        except Exception:
+        except:
             creds = None
 
-    # ---- If token invalid ----
-    if not creds or not creds.valid:
-
-        if creds and creds.expired and creds.refresh_token:
-            try:
-                creds.refresh(Request())
-            except Exception:
-                creds = None
-
-        # ---- Recreate using credentials ----
-        if not creds:
-
-            creds_json = os.getenv("GMAIL_CREDENTIALS")
-
-            if not creds_json:
-                raise Exception("Missing GMAIL_CREDENTIALS in secrets")
-
-            creds_dict = json.loads(creds_json)
+    # Refresh token
+    if creds and creds.expired and creds.refresh_token:
+        try:
+            creds.refresh(Request())
 
-            flow = InstalledAppFlow.from_client_config(
-                creds_dict,
-                SCOPES,
-            )
+            with open(TOKEN_FILE, "wb") as f:
+                pickle.dump(creds, f)
 
-            creds = flow.run_local_server(port=0)
+        except Exception as e:
+            print("❌ Token refresh failed:", e)
+            creds = None
 
-        # ---- Save token ----
-        with open(TOKEN_FILE, "wb") as f:
-            pickle.dump(creds, f)
+    if not creds:
+        raise Exception(
+            "❌ Missing token.pkl. Generate locally and upload to HF."
+        )
 
     return build("gmail", "v1", credentials=creds)
 
 
-
 # ================= EMAIL =================
 
 def send_email(to, subject, html):
@@ -112,22 +91,17 @@ def send_email(to, subject, html):
 
         body = {"raw": raw}
 
-        service.users().messages().send(
+        result = service.users().messages().send(
             userId="me",
             body=body
         ).execute()
 
-        print("✅ Gmail API sent:", to)
+        print("✅ Gmail sent:", to, "| ID:", result.get("id"))
+
         return True
 
     except Exception as e:
-        print("❌ Gmail API error:", e)
-
-        # If token is corrupted → delete and retry next time
-        if os.path.exists(TOKEN_FILE):
-            os.remove(TOKEN_FILE)
-            print("♻️ token.pkl deleted, will regenerate")
-
+        print("❌ Gmail send failed:", e)
         return False
 
 
@@ -153,14 +127,9 @@ def valid_leetcode(username):
             timeout=8
         )
 
-        if r.status_code != 200:
-            return False
-
-        data = r.json()
-
-        return "username" in data or "profile" in data
+        return r.status_code == 200
 
-    except Exception:
+    except:
         return False
 
 
@@ -195,24 +164,18 @@ def solved_today(username, slug):
 
         data = r.json()
 
-        # ✅ New API format (your case)
         if isinstance(data, dict) and "submission" in data:
             submissions = data["submission"]
 
-        # ✅ Old API format
         elif isinstance(data, dict) and "data" in data:
             submissions = data["data"]
 
-        # ✅ Direct list format
         elif isinstance(data, list):
             submissions = data
 
-        # ❌ Error / invalid format
         else:
-            print("⚠️ Unknown submission format:", data)
             return False
 
-        # Get today's timestamp (Unix day start)
         today = date.today()
 
         for s in submissions:
@@ -228,7 +191,6 @@ def solved_today(username, slug):
             if not ts:
                 continue
 
-            # Convert Unix timestamp ��� date
             solved_date = datetime.fromtimestamp(
                 int(ts),
                 tz=pytz.utc
@@ -257,7 +219,6 @@ def subscribe(username, email, timezone):
     conn = get_db()
     cur = conn.cursor()
 
-    # ---- Duplicate / Rate limit ----
     cur.execute("""
         SELECT email_verified, verification_token, unsubscribed
         FROM users
@@ -266,59 +227,50 @@ def subscribe(username, email, timezone):
 
     row = cur.fetchone()
 
-    # ---- Existing user ----
     if row:
 
-        verified, token, unsubscribed = row
+        verified, token, unsub = row
 
-        # Already active
-        if verified and not unsubscribed:
+        # Active
+        if verified and not unsub:
             cur.close()
             conn.close()
             return "⚠️ Already subscribed"
 
-        # Was unsubscribed → resubscribe
-        if verified and unsubscribed:
-        
+        # Resubscribe
+        if verified and unsub:
+
             cur.execute("""
                 UPDATE users
-                SET unsubscribed = false,
-                    leetcode_username = %s,
-                    timezone = %s
-                WHERE email = %s
+                SET unsubscribed=false,
+                    leetcode_username=%s,
+                    timezone=%s,
+                    last_sent_date=NULL,
+                    last_sent_slot=NULL
+                WHERE email=%s
             """, (username, timezone, email))
 
-        
             conn.commit()
             cur.close()
             conn.close()
-        
-            return "✅ You have been re-subscribed!"
 
+            return "✅ Re-subscribed successfully!"
 
-        # Resend verification
+        # Resend verify
         link = f"{HF_URL}?verify={token}"
 
-        email_sent = send_email(
+        send_email(
             email,
-            "🔁 Verify your subscription",
-            f"""
-            <h3>Email Verification</h3>
-            <p>Click below to activate:</p>
-            <a href="{link}">Verify</a>
-            """
+            "Verify your subscription",
+            f"<a href='{link}'>Verify</a>"
         )
 
         cur.close()
         conn.close()
-        
-        if email_sent:
-            return "📩 Verification email re-sent"
-        else:
-            return "⚠️ Failed to send verification email"
 
-    # ---- New user ----
+        return "📩 Verification re-sent"
 
+    # New user
     token = uuid.uuid4().hex
 
     cur.execute("""
@@ -330,7 +282,7 @@ def subscribe(username, email, timezone):
             verification_token,
             unsubscribed
         )
-        VALUES (%s, %s, %s, false, %s, false)
+        VALUES (%s,%s,%s,false,%s,false)
     """, (username, email, timezone, token))
 
     conn.commit()
@@ -339,20 +291,13 @@ def subscribe(username, email, timezone):
 
     link = f"{HF_URL}?verify={token}"
 
-    email_sent = send_email(
+    send_email(
         email,
-        "✅ Verify your subscription",
-        f"""
-        <h3>Welcome!</h3>
-        <p>Confirm your email:</p>
-        <a href="{link}">Verify Email</a>
-        """
+        "Verify your subscription",
+        f"<a href='{link}'>Verify</a>"
     )
 
-    if email_sent:
-        return "📩 Verification email sent"
-    else:
-        return "⚠️ Subscription failed - could not send email"
+    return "📩 Verification sent"
 
 
 # ================= VERIFY =================
@@ -364,20 +309,21 @@ def verify_user(token):
 
     cur.execute("""
         UPDATE users
-        SET email_verified = true
-        WHERE verification_token = %s
-        AND email_verified = false
+        SET email_verified=true
+        WHERE verification_token=%s
+        AND email_verified=false
     """, (token,))
 
-    affected = cur.rowcount
+    updated = cur.rowcount
+
     conn.commit()
     cur.close()
     conn.close()
 
-    if affected == 0:
-        return "❌ Invalid or already used verification link"
+    if updated == 0:
+        return "❌ Invalid link"
 
-    return "✅ Email verified successfully!"
+    return "✅ Email verified"
 
 
 # ================= UNSUBSCRIBE =================
@@ -389,20 +335,20 @@ def unsubscribe_user(token):
 
     cur.execute("""
         UPDATE users
-        SET unsubscribed = true
-        WHERE verification_token = %s
+        SET unsubscribed=true
+        WHERE verification_token=%s
     """, (token,))
 
-    affected = cur.rowcount
+    updated = cur.rowcount
 
     conn.commit()
     cur.close()
     conn.close()
 
-    if affected == 0:
-        return "❌ Invalid unsubscribe link"
+    if updated == 0:
+        return "❌ Invalid link"
 
-    return "✅ You are unsubscribed"
+    return "✅ Unsubscribed"
 
 
 # ================= SCHEDULER =================
@@ -420,60 +366,61 @@ def run_scheduler(secret):
                last_sent_date, last_sent_slot,
                verification_token
         FROM users
-        WHERE email_verified = true
-        AND unsubscribed = false
+        WHERE email_verified=true
+        AND unsubscribed=false
     """)
 
     users = cur.fetchall()
 
     title, slug = get_daily_problem()
 
-    now_utc = datetime.now(pytz.utc)
+    now = datetime.now(pytz.utc)
 
-    for uid, username, email, tz, last_date, last_slot, token in users:
+    sent = 0
 
-        local = now_utc.astimezone(pytz.timezone(tz))
+    for uid, user, mail, tz, last_d, last_s, token in users:
+
+        local = now.astimezone(pytz.timezone(tz))
         hour = local.hour
 
         if hour == 9:
             slot = "morning"
-            subject = "📘 Today's LeetCode"
+            sub = "Today's LeetCode"
             body = f"<b>{title}</b>"
 
         elif hour == 15:
             slot = "afternoon"
-            subject = "⏰ Reminder"
-            body = f"You haven't solved <b>{title}</b> yet."
+            sub = "Reminder"
+            body = f"Solve <b>{title}</b>"
 
         elif hour == 20:
             slot = "night"
-            subject = "⚠️ Final Reminder"
-            body = f"Last chance to solve <b>{title}</b> today."
+            sub = "Final Reminder"
+            body = f"Last chance: <b>{title}</b>"
 
         else:
             continue
 
         today = date.today()
 
-        # Idempotency
-        if last_date == today and last_slot == slot:
+        if last_d == today and last_s == slot:
             continue
 
-        if solved_today(username, slug):
+        if solved_today(user, slug):
             continue
 
-        unsubscribe_link = f"{HF_URL}?unsubscribe={token}"
+        unsub = f"{HF_URL}?unsubscribe={token}"
 
-        send_email(
-            email,
-            subject,
-            f"""
-            {body}
-            <br><br>
-            <a href="{unsubscribe_link}">Unsubscribe</a>
-            """
+        ok = send_email(
+            mail,
+            sub,
+            f"{body}<br><a href='{unsub}'>Unsubscribe</a>"
         )
 
+        if not ok:
+            print("❌ Failed:", mail)
+            continue
+
         cur.execute("""
             UPDATE users
             SET last_sent_date=%s,
@@ -481,60 +428,35 @@ def run_scheduler(secret):
             WHERE id=%s
         """, (today, slot, uid))
 
+        sent += 1
+
     conn.commit()
     cur.close()
     conn.close()
 
-    return "✅ Scheduler completed"
-
-
-# ================= HANDLE URL PARAMS =================
-
-def handle_url_params(request: gr.Request):
-    """Handle verify and unsubscribe links"""
-    try:
-        # Get query parameters from request
-        query_string = request.query_params
-        
-        if "verify" in query_string:
-            token = query_string["verify"]
-            return verify_user(token)
-        elif "unsubscribe" in query_string:
-            token = query_string["unsubscribe"]
-            return unsubscribe_user(token)
-        else:
-            return ""
-    except Exception as e:
-        print(f"Error handling URL params: {e}")
-        return ""
+    return f"✅ Scheduler completed. Sent: {sent}"
 
 
 # ================= UI =================
 
-with gr.Blocks(title="LeetCode Daily Notifier") as app:
+with gr.Blocks(title="LeetCode Notifier") as app:
 
-    # Handle URL parameters at startup
-    url_message = gr.Markdown("")
-    
     gr.Markdown("## 📬 LeetCode Daily Email Notifier")
 
-    user = gr.Textbox(label="LeetCode Username")
+    user = gr.Textbox(label="Username")
     mail = gr.Textbox(label="Email")
-    tz = gr.Dropdown(pytz.all_timezones, value="Asia/Kolkata", label="Timezone")
+    tz = gr.Dropdown(pytz.all_timezones, value="Asia/Kolkata")
 
-    out = gr.Textbox(label="Status")
+    out = gr.Textbox()
 
     gr.Button("Subscribe").click(subscribe, [user, mail, tz], out)
 
-    gr.Markdown("### 🔒 Internal Scheduler")
-
-    secret = gr.Textbox(label="Cron Secret", type="password")
+    gr.Markdown("### 🔒 Scheduler")
 
-    gr.Button("Run Scheduler").click(run_scheduler, secret, out)
+    sec = gr.Textbox(type="password")
 
-    # Handle URL parameters when app loads
-    app.load(handle_url_params, outputs=url_message)
+    gr.Button("Run").click(run_scheduler, sec, out)
 
 
 if __name__ == "__main__":
-    app.launch(debug=True)
+        app.launch(debug=True)