Update app.py

app.py

@@ -888,59 +888,38 @@ def split_message_for_whatsapp(message: str, max_length: int = 1000) -> list:
     return [message[i:i+max_length] for i in range(0, len(message), max_length)]
 
 def send_whatsjet_message(phone_number: str, message: str, media_type: str = None, media_path: str = None, filename: str = None) -> bool:
-    """Send a message using WhatsJet API with optional media attachment (now supports WhatsApp image+caption format)"""
+    """Send a message using WhatsJet API with optional media attachment"""
     if not all([WHATSJET_API_URL, WHATSJET_VENDOR_UID, WHATSJET_API_TOKEN]):
         logger.error("[WhatsJet] Missing environment variables.")
         return False
 
     url = f"{WHATSJET_API_URL}/{WHATSJET_VENDOR_UID}/contact/send-message?token={WHATSJET_API_TOKEN}"
 
-    # Handle WhatsApp image+caption messages (public URL only)
-    if media_type in ["image/jpeg", "image/png"] and media_path:
-        # If media_path is a URL, send as WhatsApp API expects
-        if isinstance(media_path, str) and (media_path.startswith("http://") or media_path.startswith("https://")):
-            payload = {
-                "messaging_product": "whatsapp",
-                "recipient_type": "individual",
-                "to": phone_number,
-                "type": "image",
-                "image": {
-                    "link": media_path,
-                    "caption": message[:1024]  # WhatsApp caption limit
-                }
-            }
-            try:
-                response = httpx.post(
-                    url,
-                    json=payload,
-                    timeout=15
-                )
-                response.raise_for_status()
-                logger.info(f"[WhatsJet] WhatsApp image+caption message sent successfully to {phone_number}")
-                return True
-            except Exception as e:
-                logger.error(f"[WhatsJet] Exception sending WhatsApp image+caption: {e}")
-                return False
-        else:
-            # If media_path is a local file, fallback to text only and log warning
-            logger.warning(f"[WhatsJet] Local file for image+caption not supported for WhatsApp API. Sending text only to {phone_number}.")
-            if message.strip():
-                return send_whatsjet_message(phone_number, message)
-            return False
-
-    # Handle other media messages (existing logic)
+    # Handle media messages (including images with captions)
     if media_type and media_path:
         try:
-            with open(media_path, 'rb') as f:
-                media_content = f.read()
+            # For public URLs, download the content first
+            if isinstance(media_path, str) and (media_path.startswith("http://") or media_path.startswith("https://")):
+                # Download from URL
+                response = requests.get(media_path, stream=True, timeout=15)
+                response.raise_for_status()
+                media_content = response.content
+            else:
+                # Read from local file
+                with open(media_path, 'rb') as f:
+                    media_content = f.read()
+            
+            # Encode to base64
             media_b64 = base64.b64encode(media_content).decode('utf-8')
+            
             payload = {
                 "phone_number": phone_number, 
                 "message_body": message,
                 'media_type': media_type,
                 'media_content': media_b64,
-                'media_filename': filename or os.path.basename(media_path)
+                'media_filename': filename or os.path.basename(media_path) if not media_path.startswith('http') else filename or 'image.jpg'
             }
+            
             try:
                 response = httpx.post(
                     url,