Update app.py

app.py

@@ -888,42 +888,74 @@ 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 header_image for images)"""
+    """Send a message using WhatsJet API with optional media attachment. For images, send the image as a media message (no caption), then send the caption as a separate text message."""
     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}"
 
-    # Use WhatsJet's header_image for images with captions
-    if media_type in ["image/jpeg", "image/png"] and media_path and (media_path.startswith("http://") or media_path.startswith("https://")):
-        payload = {
-            "phone_number": phone_number,
-            "header_image": media_path,
-            "message_body": message
-        }
+    # For images: send as media message (no caption), then send caption as text
+    if media_type in ["image/jpeg", "image/png"] and media_path:
         try:
-            response = httpx.post(
-                url,
-                json=payload,
-                timeout=15
-            )
-            response.raise_for_status()
-            logger.info(f"[WhatsJet] header_image message sent successfully to {phone_number}")
+            # Download image if it's a URL
+            if media_path.startswith("http://") or media_path.startswith("https://"):
+                response = requests.get(media_path, stream=True, timeout=15)
+                response.raise_for_status()
+                media_content = response.content
+                logger.info(f"[WhatsJet][DEBUG] Downloaded image content-type: {response.headers.get('Content-Type')}")
+                logger.info(f"[WhatsJet][DEBUG] First 20 bytes: {media_content[:20]}")
+            else:
+                with open(media_path, 'rb') as f:
+                    media_content = f.read()
+            media_b64 = base64.b64encode(media_content).decode('utf-8')
+            payload = {
+                "phone_number": phone_number,
+                "media_type": media_type,
+                "media_content": media_b64,
+                "media_filename": filename or os.path.basename(media_path) if not media_path.startswith('http') else filename or 'image.jpg',
+                "message_body": ""  # No caption
+            }
+            # Send image (no caption)
+            try:
+                response = httpx.post(
+                    url,
+                    json=payload,
+                    timeout=15
+                )
+                response.raise_for_status()
+                logger.info(f"[WhatsJet] Media image sent successfully to {phone_number}")
+            except Exception as e:
+                logger.error(f"[WhatsJet] Exception sending media image: {e}")
+                return False
+            # Send caption as a separate text message
+            if message.strip():
+                for chunk in split_message_for_whatsapp(message):
+                    try:
+                        text_payload = {"phone_number": phone_number, "message_body": chunk}
+                        text_response = httpx.post(
+                            url,
+                            json=text_payload,
+                            timeout=15
+                        )
+                        text_response.raise_for_status()
+                        logger.info(f"[WhatsJet] Text chunk (caption) sent successfully to {phone_number}")
+                    except Exception as e:
+                        logger.error(f"[WhatsJet] Exception sending text chunk (caption): {e}")
+                        return False
             return True
         except Exception as e:
-            logger.error(f"[WhatsJet] Exception sending header_image message: {e}")
+            logger.error(f"[WhatsJet] Exception preparing media image: {str(e)}")
             return False
 
     # Handle other media messages (existing logic)
     if media_type and media_path:
         try:
-            # For public URLs, download the content first
             if isinstance(media_path, str) and (media_path.startswith("http://") or media_path.startswith("https://")):
                 response = requests.get(media_path, stream=True, timeout=15)
                 response.raise_for_status()
                 media_content = response.content
-                logger.info(f"[WhatsJet][DEBUG] Downloaded image content-type: {response.headers.get('Content-Type')}")
+                logger.info(f"[WhatsJet][DEBUG] Downloaded media content-type: {response.headers.get('Content-Type')}")
                 logger.info(f"[WhatsJet][DEBUG] First 20 bytes: {media_content[:20]}")
             else:
                 with open(media_path, 'rb') as f:
@@ -934,7 +966,7 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                 "message_body": message,
                 'media_type': media_type,
                 'media_content': media_b64,
-                'media_filename': filename or os.path.basename(media_path) if not media_path.startswith('http') else filename or 'image.jpg'
+                'media_filename': filename or os.path.basename(media_path) if not media_path.startswith('http') else filename or 'file.bin'
             }
             try:
                 response = httpx.post(