Update app.py

app.py

@@ -943,30 +943,25 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                 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())}")
+                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 = 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
+                    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:
-                    import traceback
-                    logger.warning(f"[WhatsJet][ERROR] Multipart upload failed, trying base64 method: {e}\nTraceback: {traceback.format_exc()}")
-                
+                    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:
-                logger.warning(f"[WhatsJet] Multipart upload failed, trying base64 method: {e}")
-                
+                import traceback
+                logger.warning(f"[WhatsJet][ERROR] Multipart upload failed, trying base64 method: {e}\nTraceback: {traceback.format_exc()}")
                 # Try method 2: Send as base64 encoded content
                 try:
                     media_b64 = base64.b64encode(media_content).decode('utf-8')
@@ -980,29 +975,28 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                     # 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'])}}")
+                    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 = 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
+                        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:
-                        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)
-                
+                        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:
             import traceback
             logger.error(f"[WhatsJet][ERROR] Exception preparing media image: {str(e)}\nTraceback: {traceback.format_exc()}")
@@ -1034,26 +1028,25 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                 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())}")
+                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 = 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
+                    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:
-                    import traceback
-                    logger.warning(f"[WhatsJet][ERROR] Multipart upload failed for media, trying base64: {e}\nTraceback: {traceback.format_exc()}")
+                    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 = {
@@ -1066,26 +1059,25 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
                 # 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'])}}")
+                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 = 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
+                    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:
-                    import traceback
-                    logger.error(f"[WhatsJet][ERROR] Exception sending media message: {e}\nTraceback: {traceback.format_exc()}")
-                    return False
+                    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:
+                import traceback
+                logger.error(f"[WhatsJet][ERROR] Exception sending media message: {e}\nTraceback: {traceback.format_exc()}")
+                return False
         except Exception as e:
             import traceback
             logger.error(f"[WhatsJet][ERROR] Exception preparing media message: {str(e)}\nTraceback: {traceback.format_exc()}")
@@ -1101,24 +1093,19 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
             # 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:
-                import traceback
-                logger.error(f"[WhatsJet][ERROR] Exception sending text chunk: {e}\nTraceback: {traceback.format_exc()}")
-                return False
+            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:
             import traceback
-            logger.error(f"[WhatsJet][ERROR] Exception preparing text chunk: {str(e)}\nTraceback: {traceback.format_exc()}")
+            logger.error(f"[WhatsJet][ERROR] Exception sending text chunk: {e}\nTraceback: {traceback.format_exc()}")
             return False
     logger.info(f"[WhatsJet] Successfully sent complete text message to {phone_number}")
     return True