Upload main.py

main.py

@@ -1,15 +1,13 @@
 from fastapi import FastAPI, Request, Query, HTTPException
 from fastapi.responses import JSONResponse, PlainTextResponse
+from typing import Optional
 import os
 import httpx
 import base64
 
 app = FastAPI()
-
-# Load these once from env
-VERIFY_TOKEN       = os.getenv("VERIFY_TOKEN", "")
-WHATSAPP_API_TOKEN = os.getenv("WHATSAPP_API_TOKEN", "")
-PHONE_NUMBER_ID    = os.getenv("PHONE_NUMBER_ID", "")
+# Load verify token once from env
+VERIFY_TOKEN = os.getenv("VERIFY_TOKEN", "")
 
 @app.get("/")
 def root():
@@ -29,43 +27,40 @@ async def test_post():
 
 @app.get("/webhook")
 async def verify(
-    hub_mode: str      = Query(..., alias="hub.mode"),
-    hub_token: str     = Query(..., alias="hub.verify_token"),
-    hub_challenge: str = Query(..., alias="hub.challenge")
-):
-    # Only succeed if Meta's token matches ours
+    hub_mode: str     = Query(..., alias="hub.mode"),
+    hub_token: str    = Query(..., alias="hub.verify_token"),
+    hub_challenge: str= Query(..., alias="hub.challenge")
+) :
+    # Only succeed if Meta's verify_token matches ours
     if hub_mode == "subscribe" and hub_token == VERIFY_TOKEN:
         return PlainTextResponse(hub_challenge)
-    raise HTTPException(status_code=403, detail="Verification token mismatch")
+    raise HTTPException(status_code=403)
 
 @app.post("/webhook")
 async def receive_webhook(request: Request):
     data = await request.json()
     try:
-        msg     = data["entry"][0]["changes"][0]["value"]["messages"][0]
-        wa_id   = msg["from"]
-        msg_type= msg["type"]
+        msg = data["entry"][0]["changes"][0]["value"]["messages"][0]
+        wa_id = msg["from"]
+        msg_type = msg["type"]
 
         if msg_type == "image":
-            media_id   = msg["image"]["id"]
-            image_bytes= await download_whatsapp_media(media_id)
+            media_id = msg["image"]["id"]
+            image_bytes = await download_whatsapp_media(media_id)
             if not image_bytes:
                 return {"status": "error", "message": "Failed to process image"}
             b64_str = base64.b64encode(image_bytes).decode('utf-8')
-            reply   = f"Base64: {b64_str[:10]}"
+            reply = f"Base64: {b64_str[:10]}"
             send_whatsapp_message(wa_id, reply)
             return {"status": "success", "base64_first_10": b64_str[:10]}
-
-        # fallback for non-image
-        send_whatsapp_message(wa_id, "Please send an image.")
-        return {"status": "replied", "message": "Please send an image"}
-
+        else:
+            send_whatsapp_message(wa_id, "Please send an image.")
+            return {"status": "replied", "message": "Please send an image"}
     except Exception as e:
         print("Webhook error:", e)
         return JSONResponse(content={"error": str(e)}, status_code=400)
 
-async def download_whatsapp_media(media_id: str) -> Optional[bytes]:
-    # stub: replace with real media download later
+async def download_whatsapp_media(media_id):
     try:
         with open("test.jpg", "rb") as f:
             return f.read()
@@ -73,10 +68,11 @@ async def download_whatsapp_media(media_id: str) -> Optional[bytes]:
         print("test.jpg not found")
         return None
 
-def send_whatsapp_message(wa_id: str, text: str) -> None:
-    url = f"https://graph.facebook.com/v19.0/{PHONE_NUMBER_ID}/messages"
+def send_whatsapp_message(wa_id, text):
+    url = f"https://graph.facebook.com/v19.0/{os.getenv('PHONE_NUMBER_ID')}/messages"
     headers = {
-        "Authorization": f"Bearer {WHATSAPP_API_TOKEN}",
+        # Use the single token name everywhere
+        "Authorization": f"Bearer {os.getenv('WHATSAPP_API_TOKEN', '')}",
         "Content-Type": "application/json"
     }
     payload = {
@@ -89,6 +85,8 @@ def send_whatsapp_message(wa_id: str, text: str) -> None:
 
 @app.post("/send")
 async def check_token():
-    if WHATSAPP_API_TOKEN:
+    # Check the same token name that send_whatsapp_message() uses
+    token = os.getenv("WHATSAPP_API_TOKEN", "")
+    if token:
         return {"token_loaded": True}
-    return JSONResponse(content={"error": "WHATSAPP_API_TOKEN not set"}, status_code=400)
+    return JSONResponse(content={"error": "Token not found in environment"}, status_code=400)