Update app.py

app.py

@@ -1064,27 +1064,24 @@ 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"""
+    """Send a message using WhatsJet API with optional media attachment or public URL"""
     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 media messages
+    # Handle media messages (local file or public URL)
     if media_type and media_path:
-        try:
-            with open(media_path, 'rb') as f:
-                media_content = f.read()
-            media_b64 = base64.b64encode(media_content).decode('utf-8')
+        # If media_path is a public URL, use media_url and send caption
+        if isinstance(media_path, str) and media_path.startswith("http"):
             payload = {
-                "phone_number": phone_number, 
+                "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_type": media_type,
+                "media_url": media_path,
+                "media_filename": filename or os.path.basename(media_path)
             }
-            # Send message with increased timeout
             try:
                 response = httpx.post(
                     url,
@@ -1092,14 +1089,39 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                     timeout=15
                 )
                 response.raise_for_status()
-                logger.info(f"[WhatsJet] Media message sent successfully to {phone_number}")
+                logger.info(f"[WhatsJet] Media URL message sent successfully to {phone_number}")
                 return True
             except Exception as e:
-                logger.error(f"[WhatsJet] Exception sending media message: {e}")
+                logger.error(f"[WhatsJet] Exception sending media URL message: {e}")
+                return False
+        else:
+            # Local file logic as before
+            try:
+                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, 
+                    "message_body": message,
+                    'media_type': media_type,
+                    'media_content': media_b64,
+                    'media_filename': filename or os.path.basename(media_path)
+                }
+                try:
+                    response = httpx.post(
+                        url,
+                        json=payload,
+                        timeout=15
+                    )
+                    response.raise_for_status()
+                    logger.info(f"[WhatsJet] Media message sent successfully to {phone_number}")
+                    return True
+                except Exception as e:
+                    logger.error(f"[WhatsJet] Exception sending media message: {e}")
+                    return False
+            except Exception as e:
+                logger.error(f"[WhatsJet] Exception preparing media message: {str(e)}")
                 return False
-        except Exception as e:
-            logger.error(f"[WhatsJet] Exception preparing media message: {str(e)}")
-            return False
 
     # Handle text messages
     if not message.strip():
@@ -1108,7 +1130,6 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
     for chunk in split_message_for_whatsapp(message):
         try:
             payload = {"phone_number": phone_number, "message_body": chunk}
-            # Send message with increased timeout
             try:
                 response = httpx.post(
                     url,
@@ -1123,7 +1144,6 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
         except Exception as e:
             logger.error(f"[WhatsJet] Exception preparing text chunk: {str(e)}")
             return False
-    
     logger.info(f"[WhatsJet] Successfully sent complete text message to {phone_number}")
     return True