Update app.py

app.py

@@ -1,4 +1,4 @@
- #!/usr/bin/env python3
+#!/usr/bin/env python3
 """
 Apex Biotical Veterinary WhatsApp Bot - Premium Edition
 The most effective and accurate veterinary chatbot in the market
@@ -888,14 +888,47 @@ 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 (now supports WhatsApp image+caption format)"""
     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 WhatsApp image+caption messages (public URL only)
+    if media_type in ["image/jpeg", "image/png"] and media_path:
+        # If media_path is a URL, send as WhatsApp API expects
+        if isinstance(media_path, str) and (media_path.startswith("http://") or media_path.startswith("https://")):
+            payload = {
+                "messaging_product": "whatsapp",
+                "recipient_type": "individual",
+                "to": phone_number,
+                "type": "image",
+                "image": {
+                    "link": media_path,
+                    "caption": message[:1024]  # WhatsApp caption limit
+                }
+            }
+            try:
+                response = httpx.post(
+                    url,
+                    json=payload,
+                    timeout=15
+                )
+                response.raise_for_status()
+                logger.info(f"[WhatsJet] WhatsApp image+caption message sent successfully to {phone_number}")
+                return True
+            except Exception as e:
+                logger.error(f"[WhatsJet] Exception sending WhatsApp image+caption: {e}")
+                return False
+        else:
+            # If media_path is a local file, fallback to text only and log warning
+            logger.warning(f"[WhatsJet] Local file for image+caption not supported for WhatsApp API. Sending text only to {phone_number}.")
+            if message.strip():
+                return send_whatsjet_message(phone_number, message)
+            return False
+
+    # Handle other media messages (existing logic)
     if media_type and media_path:
         try:
             with open(media_path, 'rb') as f:
@@ -908,7 +941,6 @@ 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)
             }
-            # Send message with increased timeout
             try:
                 response = httpx.post(
                     url,
@@ -925,14 +957,13 @@ def send_whatsjet_message(phone_number: str, message: str, media_type: str = Non
             logger.error(f"[WhatsJet] Exception preparing media message: {str(e)}")
             return False
 
-    # Handle text messages
+    # Handle text messages (existing logic)
     if not message.strip():
         return True # Don't send empty messages
 
     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,
@@ -947,7 +978,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
 
@@ -3366,35 +3396,38 @@ load_products_data()
 
 def get_product_image_path(product_name: str) -> str:
     """
-    Get the image path for a product
-    Returns the path to the product image if it exists, otherwise None
+    Get the public URL for a product image if it exists in the uploads directory.
+    Returns the public URL if found, otherwise falls back to static/images or None.
     """
     try:
-        # Create images directory if it doesn't exist
+        # Check uploads directory for exact match (case and spaces preserved)
+        uploads_dir = "uploads"
+        image_extensions = ['.jpg', '.jpeg', '.png']
+        for ext in image_extensions:
+            filename = f"{product_name}{ext}"
+            local_path = os.path.join(uploads_dir, filename)
+            if os.path.exists(local_path):
+                # Construct the public URL for Hugging Face Space
+                # (Assumes the Space is named dreamstream-1-chatbot)
+                public_url = f"https://dreamstream-1-chatbot.hf.space/uploads/{filename.replace(' ', '%20')}"
+                logger.info(f"[Image] Found product image in uploads: {public_url}")
+                return public_url
+        # Fallback to static/images (old logic)
         images_dir = "static/images"
         os.makedirs(images_dir, exist_ok=True)
-        
-        # Clean product name for filename
         safe_name = re.sub(r'[^\w\s-]', '', product_name).replace(' ', '_').lower()
-        
-        # Check for common image extensions
         image_extensions = ['.jpg', '.jpeg', '.png', '.webp', '.gif']
-        
         for ext in image_extensions:
             image_path = os.path.join(images_dir, f"{safe_name}{ext}")
             if os.path.exists(image_path):
                 logger.info(f"[Image] Found product image: {image_path}")
                 return image_path
-        
-        # If no specific product image found, check for a default image
         default_image_path = os.path.join(images_dir, "default_product.jpg")
         if os.path.exists(default_image_path):
             logger.info(f"[Image] Using default product image: {default_image_path}")
             return default_image_path
-        
         logger.warning(f"[Image] No image found for product: {product_name}")
         return None
-        
     except Exception as e:
         logger.error(f"[Image] Error getting product image path: {e}")
         return None