Update app.py

app.py

@@ -937,7 +937,7 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                 }
                 data = {
                     'phone_number': phone_number,
-                    'message_body': ''  # No caption with image
+                    'message_body': message  # Include the message body with the image
                 }
                 
                 logger.info(f"[WhatsJet] Attempting multipart upload for {phone_number}")
@@ -962,22 +962,6 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                 
                 response.raise_for_status()
                 logger.info(f"[WhatsJet] Media image sent successfully via multipart upload to {phone_number}")
-                
-                # Send caption as 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:
@@ -991,7 +975,7 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                         "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
+                        "message_body": message  # Include the message body with the image
                     }
                     
                     logger.info(f"[WhatsJet] Attempting base64 upload for {phone_number}")
@@ -999,7 +983,7 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                     logger.info(f"[WhatsJet] Base64 payload - phone_number: {payload['phone_number']}")
                     logger.info(f"[WhatsJet] Base64 payload - media_type: {payload['media_type']}")
                     logger.info(f"[WhatsJet] Base64 payload - media_filename: {payload['media_filename']}")
-                    logger.info(f"[WhatsJet] Base64 payload - message_body: '{payload['message_body']}'")
+                    logger.info(f"[WhatsJet] Base64 payload - message_body: '{payload['message_body'][:50]}...'")
                     logger.info(f"[WhatsJet] Base64 payload - media_content length: {len(payload['media_content'])} chars")
                     
                     response = httpx.post(
@@ -1019,22 +1003,6 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                     
                     response.raise_for_status()
                     logger.info(f"[WhatsJet] Media image sent successfully via base64 to {phone_number}")
-                    
-                    # Send caption as 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:
@@ -1042,7 +1010,7 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                     # Fallback: send text only
                     logger.warning(f"[WhatsJet] Both image methods failed, sending text only for {phone_number}")
                     return send_whatsjet_message(phone_number, message)
-                    
+                
         except Exception as e:
             logger.error(f"[WhatsJet] Exception preparing media image: {str(e)}")
             # Fallback: send text only