Update whatsapp_client.py

whatsapp_client.py

@@ -1,4 +1,3 @@
-# whatsapp_client.py
 import requests
 import os
 import logging
@@ -9,12 +8,12 @@ logger = logging.getLogger(__name__)
 
 # --- bump to v22.0 ---
 WHATSAPP_API_VERSION = os.getenv("WHATSAPP_API_VERSION", "v22.0")
-WHATSAPP_TOKEN = os.environ["whatsapp_token"]
-PHONE_NUMBER_ID = os.environ["phone_number_id"]
-BASE_URL = f"https://graph.facebook.com/{WHATSAPP_API_VERSION}/{PHONE_NUMBER_ID}"
-HEADERS = {
+WHATSAPP_TOKEN       = os.environ["whatsapp_token"]
+PHONE_NUMBER_ID      = os.environ["phone_number_id"]
+BASE_URL             = f"https://graph.facebook.com/{WHATSAPP_API_VERSION}/{PHONE_NUMBER_ID}"
+HEADERS              = {
     "Authorization": f"Bearer {WHATSAPP_TOKEN}",
-    "Content-Type": "application/json",
+    "Content-Type":  "application/json",
 }
 
 def send_message(recipient_id: str, message_data: Dict[str, Any]) -> bool:
@@ -22,18 +21,18 @@ def send_message(recipient_id: str, message_data: Dict[str, Any]) -> bool:
     url = f"{BASE_URL}/messages"
     payload = {
         "messaging_product": "whatsapp",
-        "recipient_type": "individual",
-        "to": recipient_id,
+        "recipient_type":    "individual",
+        "to":                recipient_id,
         **message_data
     }
     try:
-        resp = requests.post(url, headers=HEADERS, json=payload, timeout=30)
+        resp = requests.post(url, headers=HEADERS, json=payload)
         resp.raise_for_status()
         logger.info(f"Message sent to {recipient_id}: {resp.json()}")
         return True
     except requests.exceptions.RequestException as e:
         logger.error(f"Error sending message to {recipient_id}: {e}")
-        if getattr(e, "response", None) is not None:
+        if e.response is not None:
             logger.error(f"Status: {e.response.status_code} Body: {e.response.text}")
         return False
     except Exception as e:
@@ -50,7 +49,7 @@ def send_text_message(recipient_id: str, text: str) -> bool:
 
 def send_image_message(recipient_id: str,
                        image_url: Optional[str] = None,
-                       image_id: Optional[str] = None) -> bool:
+                       image_id:  Optional[str] = None) -> bool:
     """Sends an image via link or uploaded media ID."""
     if not (image_url or image_id):
         logger.error("send_image_message: need image_url or image_id")
@@ -60,17 +59,17 @@ def send_image_message(recipient_id: str,
     return send_message(recipient_id, message_data)
 
 def send_reply_buttons(recipient_id: str,
-                       body_text: str,
-                       button_data: list) -> bool:
+                       body_text:    str,
+                       button_data:  list) -> bool:
     """Sends up to 3 reply‐buttons."""
     valid_buttons = []
     for btn in button_data[:3]:
         reply = btn.get("reply", {})
-        btn_id = str(reply.get("id", "")).strip()[:256]
-        btn_title = str(reply.get("title", "")).strip()[:20]
+        btn_id    = str(reply.get("id", "")).strip()[:256]
+        btn_title = str(reply.get("title","")).strip()[:20]
         if btn_id and btn_title:
             valid_buttons.append({
-                "type": "reply",
+                "type":  "reply",
                 "reply": {"id": btn_id, "title": btn_title}
             })
         else:
@@ -83,96 +82,25 @@ def send_reply_buttons(recipient_id: str,
         "type": "interactive",
         "interactive": {
             "type": "button",
-            "body": {"text": str(body_text)[:1024]},
+            "body":   {"text": str(body_text)[:1024]},
             "action": {"buttons": valid_buttons}
         },
     }
     return send_message(recipient_id, message_data)
 
-def upload_media(file_path: str, mime_type: str = "audio/mpeg") -> Optional[str]:
-    """
-    Uploads media to WhatsApp Cloud API and returns media_id.
-    Uses: POST /{PHONE_NUMBER_ID}/media
-    """
-    url = f"{BASE_URL}/media"
-    headers = {"Authorization": f"Bearer {WHATSAPP_TOKEN}"}
-
-    try:
-        if not os.path.isfile(file_path):
-            logger.error(f"upload_media: file not found: {file_path}")
-            return None
-
-        files = {
-            "file": (os.path.basename(file_path), open(file_path, "rb"), mime_type)
-        }
-        data = {
-            "messaging_product": "whatsapp",
-            "type": mime_type
-        }
-
-        resp = requests.post(url, headers=headers, files=files, data=data, timeout=60)
-        resp.raise_for_status()
-        media_id = resp.json().get("id")
-        if not media_id:
-            logger.error(f"upload_media: missing media id in response: {resp.text}")
-            return None
-        logger.info(f"upload_media: uploaded {file_path} -> media_id={media_id}")
-        return media_id
-
-    except requests.exceptions.RequestException as e:
-        logger.error(f"upload_media: request error: {e}")
-        if getattr(e, "response", None) is not None:
-            logger.error(f"Status: {e.response.status_code} Body: {e.response.text}")
-        return None
-    except Exception as e:
-        logger.error(f"upload_media: unexpected error: {e}", exc_info=True)
-        return None
-
-def send_audio_message(recipient_id: str,
-                       audio_path: Optional[str] = None,
-                       audio_url: Optional[str] = None,
-                       audio_id: Optional[str] = None) -> bool:
-    """
-    Sends audio to WhatsApp.
-    Priority:
-      1) audio_id (already uploaded)
-      2) audio_url (public link)
-      3) audio_path (local file -> upload -> send)
-    """
-    try:
-        final_audio_id = audio_id
-
-        if not final_audio_id and audio_path:
-            final_audio_id = upload_media(audio_path, mime_type="audio/mpeg")
-
-        if final_audio_id:
-            message_data = {"type": "audio", "audio": {"id": final_audio_id}}
-            return send_message(recipient_id, message_data)
-
-        if audio_url:
-            message_data = {"type": "audio", "audio": {"link": audio_url}}
-            return send_message(recipient_id, message_data)
-
-        logger.error("send_audio_message: need audio_id, audio_url, or audio_path")
-        return False
-
-    except Exception as e:
-        logger.error(f"send_audio_message: failed: {e}", exc_info=True)
-        return False
-
 def get_media_url(media_id: str) -> Optional[str]:
     """Gets a temporary download URL for a media ID."""
-    url = f"https://graph.facebook.com/{WHATSAPP_API_VERSION}/{media_id}"
+    url     = f"https://graph.facebook.com/{WHATSAPP_API_VERSION}/{media_id}"
     headers = {"Authorization": f"Bearer {WHATSAPP_TOKEN}"}
     try:
-        resp = requests.get(url, headers=headers, timeout=30)
+        resp = requests.get(url, headers=headers)
         resp.raise_for_status()
         data = resp.json()
         logger.info(f"Media URL for {media_id}: {data.get('url')}")
         return data.get("url")
     except requests.exceptions.RequestException as e:
         logger.error(f"Error getting media URL {media_id}: {e}")
-        if getattr(e, "response", None) is not None:
+        if e.response is not None:
             logger.error(f"Status: {e.response.status_code} Body: {e.response.text}")
         return None
     except Exception as e:
@@ -183,41 +111,94 @@ def download_media(media_url: str, save_path: str) -> Optional[str]:
     """Downloads media from URL to local `save_path`."""
     headers = {"Authorization": f"Bearer {WHATSAPP_TOKEN}"}
     try:
-        resp = requests.get(media_url, headers=headers, stream=True, timeout=60)
+        resp = requests.get(media_url, headers=headers, stream=True)
         resp.raise_for_status()
         os.makedirs(os.path.dirname(save_path), exist_ok=True)
         with open(save_path, "wb") as f:
             for chunk in resp.iter_content(chunk_size=8192):
-                if chunk:
-                    f.write(chunk)
+                f.write(chunk)
         logger.info(f"Media saved to {save_path}")
         return save_path
     except requests.exceptions.RequestException as e:
         logger.error(f"Error downloading from {media_url}: {e}")
-        if getattr(e, "response", None) is not None:
+        if e.response is not None:
             logger.error(f"Status: {e.response.status_code} Body: {e.response.text}")
         return None
     except Exception as e:
         logger.error(f"Unexpected error downloading media: {e}")
         return None
 
+def upload_media(file_path: str, mime_type: str = "audio/mpeg") -> Optional[str]:
+    """Uploads media to WhatsApp Cloud API and returns media_id."""
+    url = f"{BASE_URL}/media"
+    headers = {"Authorization": f"Bearer {WHATSAPP_TOKEN}"}
+    try:
+        if not os.path.isfile(file_path):
+            logger.error(f"upload_media: file not found: {file_path}")
+            return None
+        files = {
+            "file": (os.path.basename(file_path), open(file_path, "rb"), mime_type)
+        }
+        data = {
+            "messaging_product": "whatsapp",
+            "type": mime_type
+        }
+        resp = requests.post(url, headers=headers, files=files, data=data)
+        resp.raise_for_status()
+        media_id = resp.json().get("id")
+        logger.info(f"upload_media: uploaded {file_path} -> media_id={media_id}")
+        return media_id
+    except Exception as e:
+        logger.error(f"upload_media: failed: {e}", exc_info=True)
+        return None
+
+def send_audio_message(recipient_id: str,
+                       audio_path: Optional[str] = None,
+                       audio_url: Optional[str] = None,
+                       audio_id: Optional[str] = None) -> bool:
+    """
+    Sends audio to WhatsApp.
+    Priority:
+      1) audio_id (already uploaded)
+      2) audio_url (public link)
+      3) audio_path (local file -> upload -> send)
+    """
+    final_audio_id = audio_id
+
+    # If we have a local path but no ID, upload it first to get an ID
+    if not final_audio_id and audio_path:
+        final_audio_id = upload_media(audio_path, mime_type="audio/mpeg")
+    
+    # If we have an ID now, send it
+    if final_audio_id:
+        message_data = {"type": "audio", "audio": {"id": final_audio_id}}
+        return send_message(recipient_id, message_data)
+        
+    # If we have a URL, send it
+    if audio_url:
+        message_data = {"type": "audio", "audio": {"link": audio_url}}
+        return send_message(recipient_id, message_data)
+    
+    logger.error("send_audio_message: need audio_id, audio_url, or audio_path")
+    return False
+
 def get_message_details(data: Dict[str, Any]) -> Optional[Dict[str, Any]]:
     """Parses incoming webhook payload into a uniform dict."""
     try:
         if "entry" not in data or not data["entry"]:
             return None
-        change = data["entry"][0].get("changes", [{}])[0]
+        change       = data["entry"][0].get("changes", [{}])[0]
         if change.get("field") != "messages":
             return None
 
-        msg = change.get("value", {}).get("messages", [{}])[0]
+        msg          = change.get("value", {}).get("messages", [{}])[0]
         if not msg:
             return None
 
         details = {
-            "type": msg.get("type"),
-            "from": msg.get("from"),
-            "id": msg.get("id"),
+            "type":      msg.get("type"),
+            "from":      msg.get("from"),
+            "id":        msg.get("id"),
             "timestamp": msg.get("timestamp")
         }
 
@@ -225,7 +206,7 @@ def get_message_details(data: Dict[str, Any]) -> Optional[Dict[str, Any]]:
             details["text"] = msg.get("text", {}).get("body")
         elif details["type"] == "audio":
             details["audio_id"] = msg.get("audio", {}).get("id")
-        elif details["type"] == "image":
+        elif details["type"] == "image": 
             image_body = msg.get("image", {})
             details["image_id"] = image_body.get("id")
             details["caption"] = image_body.get("caption")
@@ -234,7 +215,7 @@ def get_message_details(data: Dict[str, Any]) -> Optional[Dict[str, Any]]:
             details["interactive_type"] = itype
             if itype == "button_reply":
                 br = msg["interactive"]["button_reply"]
-                details["button_reply_id"] = br.get("id")
+                details["button_reply_id"]    = br.get("id")
                 details["button_reply_title"] = br.get("title")
 
         if not all([details.get("type"), details.get("from"), details.get("id")]):