Update app.py

app.py

@@ -939,30 +939,30 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                     'phone_number': phone_number,
                     'message_body': message  # Include the message body with the image
                 }
-                
-                logger.info(f"[WhatsJet] Attempting multipart upload for {phone_number}")
-                logger.info(f"[WhatsJet] Multipart payload - data: {data}")
-                logger.info(f"[WhatsJet] Multipart payload - files: {list(files.keys())}")
-                
-                response = httpx.post(
-                    url,
-                    data=data,
-                    files=files,
-                    timeout=30
-                )
-                
-                # Log response details for debugging
-                logger.info(f"[WhatsJet] Multipart response status: {response.status_code}")
-                logger.info(f"[WhatsJet] Multipart response headers: {dict(response.headers)}")
+                # Enhanced logging
+                logger.info(f"[WhatsJet][DEBUG] URL: {url}")
+                logger.info(f"[WhatsJet][DEBUG] Multipart data: {data}")
+                logger.info(f"[WhatsJet][DEBUG] Multipart files: {list(files.keys())}")
                 try:
-                    response_text = response.text
-                    logger.info(f"[WhatsJet] Multipart response body: {response_text[:500]}...")
-                except:
-                    logger.info(f"[WhatsJet] Multipart response body: Unable to read")
-                
-                response.raise_for_status()
-                logger.info(f"[WhatsJet] Media image sent successfully via multipart upload to {phone_number}")
-                return True
+                    response = httpx.post(
+                        url,
+                        data=data,
+                        files=files,
+                        timeout=30
+                    )
+                    logger.info(f"[WhatsJet][DEBUG] Multipart response status: {response.status_code}")
+                    logger.info(f"[WhatsJet][DEBUG] Multipart response headers: {dict(response.headers)}")
+                    try:
+                        response_text = response.text
+                        logger.info(f"[WhatsJet][DEBUG] Multipart response body: {response_text[:1000]}" + ("..." if len(response_text) > 1000 else ""))
+                    except Exception as e:
+                        logger.info(f"[WhatsJet][DEBUG] Multipart response body: Unable to read: {e}")
+                    response.raise_for_status()
+                    logger.info(f"[WhatsJet] Media image sent successfully via multipart upload to {phone_number}")
+                    return True
+                except Exception as e:
+                    import traceback
+                    logger.warning(f"[WhatsJet][ERROR] Multipart upload failed, trying base64 method: {e}\nTraceback: {traceback.format_exc()}")
                 
             except Exception as e:
                 logger.warning(f"[WhatsJet] Multipart upload failed, trying base64 method: {e}")
@@ -977,42 +977,35 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                         "media_filename": filename or os.path.basename(media_path) if not media_path.startswith('http') else filename or 'image.jpg',
                         "message_body": message  # Include the message body with the image
                     }
-                    
-                    logger.info(f"[WhatsJet] Attempting base64 upload for {phone_number}")
-                    logger.info(f"[WhatsJet] Base64 payload keys: {list(payload.keys())}")
-                    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'][:50]}...'")
-                    logger.info(f"[WhatsJet] Base64 payload - media_content length: {len(payload['media_content'])} chars")
-                    
-                    response = httpx.post(
-                        url,
-                        json=payload,
-                        timeout=30
-                    )
-                    
-                    # Log response details for debugging
-                    logger.info(f"[WhatsJet] Base64 response status: {response.status_code}")
-                    logger.info(f"[WhatsJet] Base64 response headers: {dict(response.headers)}")
+                    # Enhanced logging
+                    logger.info(f"[WhatsJet][DEBUG] URL: {url}")
+                    logger.info(f"[WhatsJet][DEBUG] Base64 payload: {{'phone_number': payload['phone_number'], 'media_type': payload['media_type'], 'media_filename': payload['media_filename'], 'message_body': payload['message_body'][:50] + '...', 'media_content_length': len(payload['media_content'])}}")
                     try:
-                        response_text = response.text
-                        logger.info(f"[WhatsJet] Base64 response body: {response_text[:500]}...")
-                    except:
-                        logger.info(f"[WhatsJet] Base64 response body: Unable to read")
-                    
-                    response.raise_for_status()
-                    logger.info(f"[WhatsJet] Media image sent successfully via base64 to {phone_number}")
-                    return True
-                    
-                except Exception as e:
-                    logger.error(f"[WhatsJet] Base64 method also failed: {e}")
-                    # 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)
+                        response = httpx.post(
+                            url,
+                            json=payload,
+                            timeout=30
+                        )
+                        logger.info(f"[WhatsJet][DEBUG] Base64 response status: {response.status_code}")
+                        logger.info(f"[WhatsJet][DEBUG] Base64 response headers: {dict(response.headers)}")
+                        try:
+                            response_text = response.text
+                            logger.info(f"[WhatsJet][DEBUG] Base64 response body: {response_text[:1000]}" + ("..." if len(response_text) > 1000 else ""))
+                        except Exception as e:
+                            logger.info(f"[WhatsJet][DEBUG] Base64 response body: Unable to read: {e}")
+                        response.raise_for_status()
+                        logger.info(f"[WhatsJet] Media image sent successfully via base64 to {phone_number}")
+                        return True
+                    except Exception as e:
+                        import traceback
+                        logger.error(f"[WhatsJet][ERROR] Base64 method also failed: {e}\nTraceback: {traceback.format_exc()}")
+                        # 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)}")
+            import traceback
+            logger.error(f"[WhatsJet][ERROR] Exception preparing media image: {str(e)}\nTraceback: {traceback.format_exc()}")
             # Fallback: send text only
             return send_whatsjet_message(phone_number, message)
 
@@ -1028,7 +1021,6 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
             else:
                 with open(media_path, 'rb') as f:
                     media_content = f.read()
-            
             # Try multipart first, then base64
             try:
                 files = {
@@ -1038,19 +1030,30 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                     'phone_number': phone_number,
                     'message_body': message
                 }
-                
-                response = httpx.post(
-                    url,
-                    data=data,
-                    files=files,
-                    timeout=30
-                )
-                response.raise_for_status()
-                logger.info(f"[WhatsJet] Media message sent successfully via multipart to {phone_number}")
-                return True
-                
-            except Exception as e:
-                logger.warning(f"[WhatsJet] Multipart upload failed for media, trying base64: {e}")
+                # Enhanced logging
+                logger.info(f"[WhatsJet][DEBUG] URL: {url}")
+                logger.info(f"[WhatsJet][DEBUG] Multipart data: {data}")
+                logger.info(f"[WhatsJet][DEBUG] Multipart files: {list(files.keys())}")
+                try:
+                    response = httpx.post(
+                        url,
+                        data=data,
+                        files=files,
+                        timeout=30
+                    )
+                    logger.info(f"[WhatsJet][DEBUG] Multipart response status: {response.status_code}")
+                    logger.info(f"[WhatsJet][DEBUG] Multipart response headers: {dict(response.headers)}")
+                    try:
+                        response_text = response.text
+                        logger.info(f"[WhatsJet][DEBUG] Multipart response body: {response_text[:1000]}" + ("..." if len(response_text) > 1000 else ""))
+                    except Exception as e:
+                        logger.info(f"[WhatsJet][DEBUG] Multipart response body: Unable to read: {e}")
+                    response.raise_for_status()
+                    logger.info(f"[WhatsJet] Media message sent successfully via multipart to {phone_number}")
+                    return True
+                except Exception as e:
+                    import traceback
+                    logger.warning(f"[WhatsJet][ERROR] Multipart upload failed for media, trying base64: {e}\nTraceback: {traceback.format_exc()}")
                 
                 media_b64 = base64.b64encode(media_content).decode('utf-8')
                 payload = {
@@ -1060,20 +1063,32 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                     'media_content': media_b64,
                     'media_filename': filename or os.path.basename(media_path) if not media_path.startswith('http') else filename or 'file.bin'
                 }
+                # Enhanced logging
+                logger.info(f"[WhatsJet][DEBUG] URL: {url}")
+                logger.info(f"[WhatsJet][DEBUG] Base64 payload: {{'phone_number': payload['phone_number'], 'media_type': payload['media_type'], 'media_filename': payload['media_filename'], 'message_body': payload['message_body'][:50] + '...', 'media_content_length': len(payload['media_content'])}}")
                 try:
                     response = httpx.post(
                         url,
                         json=payload,
                         timeout=30
                     )
+                    logger.info(f"[WhatsJet][DEBUG] Base64 response status: {response.status_code}")
+                    logger.info(f"[WhatsJet][DEBUG] Base64 response headers: {dict(response.headers)}")
+                    try:
+                        response_text = response.text
+                        logger.info(f"[WhatsJet][DEBUG] Base64 response body: {response_text[:1000]}" + ("..." if len(response_text) > 1000 else ""))
+                    except Exception as e:
+                        logger.info(f"[WhatsJet][DEBUG] Base64 response body: Unable to read: {e}")
                     response.raise_for_status()
                     logger.info(f"[WhatsJet] Media message sent successfully via base64 to {phone_number}")
                     return True
                 except Exception as e:
-                    logger.error(f"[WhatsJet] Exception sending media message: {e}")
+                    import traceback
+                    logger.error(f"[WhatsJet][ERROR] Exception sending media message: {e}\nTraceback: {traceback.format_exc()}")
                     return False
         except Exception as e:
-            logger.error(f"[WhatsJet] Exception preparing media message: {str(e)}")
+            import traceback
+            logger.error(f"[WhatsJet][ERROR] Exception preparing media message: {str(e)}\nTraceback: {traceback.format_exc()}")
             return False
 
     # Handle text messages (existing logic)
@@ -1083,19 +1098,27 @@ 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}
+            # Enhanced logging
+            logger.info(f"[WhatsJet][DEBUG] URL: {url}")
+            logger.info(f"[WhatsJet][DEBUG] Payload: {json.dumps(payload)}")
             try:
                 response = httpx.post(
                     url,
                     json=payload,
                     timeout=15
                 )
+                logger.info(f"[WhatsJet][DEBUG] Response status: {response.status_code}")
+                logger.info(f"[WhatsJet][DEBUG] Response headers: {dict(response.headers)}")
+                logger.info(f"[WhatsJet][DEBUG] Response body: {response.text}")
                 response.raise_for_status()
                 logger.info(f"[WhatsJet] Text chunk sent successfully to {phone_number}")
             except Exception as e:
-                logger.error(f"[WhatsJet] Exception sending text chunk: {e}")
+                import traceback
+                logger.error(f"[WhatsJet][ERROR] Exception sending text chunk: {e}\nTraceback: {traceback.format_exc()}")
                 return False
         except Exception as e:
-            logger.error(f"[WhatsJet] Exception preparing text chunk: {str(e)}")
+            import traceback
+            logger.error(f"[WhatsJet][ERROR] Exception preparing text chunk: {str(e)}\nTraceback: {traceback.format_exc()}")
             return False
     logger.info(f"[WhatsJet] Successfully sent complete text message to {phone_number}")
     return True
@@ -4054,4 +4077,4 @@ async def test_whatsjet_payloads(phone: str):
 if __name__ == "__main__":
     # Launch FastAPI app
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+    uvicorn.run(app, host="0.0.0.0", port=7860)