Update app.py

app.py

@@ -2760,144 +2760,33 @@ async def send_product_image_with_caption(from_number: str, product: Dict[str, A
     """
     Send product image (if available) with product details as caption in a single WhatsApp message.
     If image is not available, send only the product details as text.
-    Now supports 'Images' column in CSV (Google Drive or direct links).
     """
     ensure_images_dir()
     product_name = product.get('Product Name', 'Unknown Product')
     details = generate_veterinary_product_response(product, user_context)
-    image_url = product.get('Images', '').strip() if 'Images' in product else ''
-    
-    # Force image URL for Respira Aid Plus (use cPanel public URL)
-    if product_name.lower().strip() == "respira aid plus":
-        image_url = "https://amgocus.com/uploads/images/Respira%20Aid%20Plus.jpg"
-    
-    logger.info(f"[Product] Processing image for product: {product_name}")
-    logger.info(f"[Product] Image URL from CSV: {image_url}")
-    
-    try:
-        # First, check if we have an image URL from CSV
-        if image_url:
-            # Convert Google Drive link to direct download if needed
-            if 'drive.google.com' in image_url:
-                logger.info(f"[Product] Converting Google Drive link: {image_url}")
-                if '/d/' in image_url:
-                    file_id = image_url.split('/d/')[1].split('/')[0]
-                elif 'id=' in image_url:
-                    file_id = image_url.split('id=')[1].split('&')[0]
-                else:
-                    file_id = ''
-                if file_id:
-                    image_url = f"https://drive.google.com/uc?export=download&id={file_id}"
-                    logger.info(f"[Product] Converted to direct download URL: {image_url}")
-            media_type = 'image/jpeg'
-            filename = f"{product_name.replace(' ', '_')}.jpg"
-            try:
-                logger.info(f"[Product] Testing image URL accessibility: {image_url}")
-                headers = {
-                    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-                    'Accept': 'image/webp,image/apng,image/*,*/*;q=0.8',
-                    'Accept-Language': 'en-US,en;q=0.9',
-                    'Accept-Encoding': 'gzip, deflate, br',
-                    'Connection': 'keep-alive',
-                    'Upgrade-Insecure-Requests': '1'
-                }
-                test_response = requests.get(image_url, headers=headers, timeout=10, stream=True, allow_redirects=True)
-                if test_response.status_code != 200:
-                    logger.warning(f"[Product] Image URL not accessible (status {test_response.status_code}): {image_url}")
-                    raise Exception(f"Image URL not accessible: {test_response.status_code}")
-                logger.info(f"[Product] Image URL is accessible")
-            except Exception as e:
-                logger.warning(f"[Product] Failed to test image URL {image_url}: {e}")
-                image_url = None
-            # If image_url is public, send image+caption in a single message
-            if image_url and image_url.startswith('http'):
-                logger.info(f"[Product] Sending public image URL with caption using send_whatsjet_message: {image_url}")
-                send_whatsjet_message(
-                    from_number,
-                    details,
-                    media_type=media_type,
-                    media_path=image_url,
-                    filename=filename
-                )
-                return
-            # Otherwise, fallback to local file logic
-            # Send using public URL (not local file)
-            if image_url:
-                logger.info(f"[Product] Attempting to send image from CSV URL for: {product_name}")
-                success = send_whatsjet_message(
-                    from_number,
-                    details,
-                    media_type=media_type,
-                    media_path=image_url,  # Use public URL directly
-                    filename=filename
-                )
-                
-                if success:
-                    logger.info(f"[Product] Successfully sent image from CSV link with caption for product: {product_name}")
-                    return
-                else:
-                    logger.warning(f"[Product] Failed to send image from CSV link, trying fallback: {product_name}")
-        
-        # Fallback 1: Try with a known public test image
-        logger.info(f"[Product] Trying public test image for: {product_name}")
-        test_image_url = "https://www.w3schools.com/w3images/lights.jpg"
-        media_type = 'image/jpeg'
+    logger.info(f"[DEBUG] About to look up image for product: {product_name}")
+    image_path = get_product_image_path(product_name)
+    if image_path and image_path.startswith('http'):
+        media_type = get_product_image_media_type(image_path)
         filename = f"{product_name.replace(' ', '_')}.jpg"
-        
+        logger.info(f"[Product] Sending public image URL with caption: {image_path}")
         success = send_whatsjet_message(
             from_number,
             details,
             media_type=media_type,
-            media_path=test_image_url,
+            media_path=image_path,
             filename=filename
         )
-        
         if success:
-            logger.info(f"[Product] Successfully sent test image with caption for product: {product_name}")
+            logger.info(f"[Product] Successfully sent image+caption for product: {product_name}")
             return
-        
-        # Fallback 2: Try local uploads directory (public URL)
-        logger.info(f"[Product] Trying local uploads directory for: {product_name}")
-        image_path = get_product_image_path(product_name)
-        if image_path:
-            media_type = get_product_image_media_type(image_path)
-            filename = f"{product_name.replace(' ', '_')}.jpg"
-            # If it's a public URL, send as image+caption
-            if image_path.startswith('http'):
-                logger.info(f"[Product] Sending normalized cPanel public URL with caption: {image_path}")
-                # Send image first using the correct method for URLs
-                image_success = send_whatsjet_media_image_only(
-                    from_number,
-                    image_path,
-                    filename=filename
-                )
-                if image_success:
-                    logger.info(f"[Product] Image sent successfully, now sending product details")
-                    # Send product details as text
-                    send_whatsjet_message(from_number, details)
-                    return
-                else:
-                    logger.warning(f"[Product] Failed to send image, sending text only")
-                    send_whatsjet_message(from_number, details)
-                    return
-            # Otherwise, treat as local file
-            elif os.path.exists(image_path):
-                logger.info(f"[Product] Sending local file with caption: {image_path}")
-                send_whatsjet_message(
-                    from_number,
-                    details,
-                    media_type=media_type,
-                    media_path=image_path,
-                    filename=filename
-                )
-                return
-        # No image available, send text only
-        logger.info(f"[Product] No image available, sending text only for: {product_name}")
-        send_whatsjet_message(from_number, details)
-    except Exception as e:
-        logger.error(f"[Product] Error sending product image with caption: {e}")
-        logger.info(f"[Product] Falling back to text-only message for: {product_name}")
-        send_whatsjet_message(from_number, details)
+        else:
+            logger.warning(f"[Product] Failed to send image+caption, sending text only: {product_name}")
+            send_whatsjet_message(from_number, details)
+            return
+    # No image available, send text only
+    logger.info(f"[Product] No image available, sending text only for: {product_name}")
+    send_whatsjet_message(from_number, details)
 
 # Test endpoint for product image with caption
 @app.get("/test-product-image-with-caption")
@@ -3496,135 +3385,6 @@ async def handle_voice_message_complete(from_number: str, msg: dict):
         send_whatsjet_message(from_number, 
             "❌ Error processing voice message. Please try a text message.")
 
-# --- Update send_product_image_with_caption to latest version ---
-async def send_product_image_with_caption(from_number: str, product: Dict[str, Any], user_context: Dict[str, Any]):
-    logger.info(f"[Product] send_product_image_with_caption called for: {product.get('Product Name', '')}")
-    """
-    Send product image (if available) with product details as caption in a single WhatsApp message.
-    If image is not available, send only the product details as text.
-    Now supports 'Images' column in CSV (Google Drive or direct links).
-    """
-    ensure_images_dir()
-    product_name = product.get('Product Name', 'Unknown Product')
-    details = generate_veterinary_product_response(product, user_context)
-    image_url = product.get('Images', '').strip() if 'Images' in product else ''
-    
-    # Force image URL for Respira Aid Plus (use cPanel public URL)
-    if product_name.lower().strip() == "respira aid plus":
-        image_url = "https://amgocus.com/uploads/images/Respira%20Aid%20Plus.jpg"
-    
-    logger.info(f"[Product] Processing image for product: {product_name}")
-    logger.info(f"[Product] Image URL from CSV: {image_url}")
-    try:
-        # First, check if we have an image URL from CSV
-        if image_url:
-            # Convert Google Drive link to direct download if needed
-            if 'drive.google.com' in image_url:
-                logger.info(f"[Product] Converting Google Drive link: {image_url}")
-                if '/d/' in image_url:
-                    file_id = image_url.split('/d/')[1].split('/')[0]
-                elif 'id=' in image_url:
-                    file_id = image_url.split('id=')[1].split('&')[0]
-                else:
-                    file_id = ''
-                if file_id:
-                    image_url = f"https://drive.google.com/uc?export=download&id={file_id}"
-                    logger.info(f"[Product] Converted to direct download URL: {image_url}")
-            # Use the public URL directly for WhatsApp API
-            media_type = 'image/jpeg'
-            filename = f"{product_name.replace(' ', '_')}.jpg"
-            # Test the image URL first
-            try:
-                logger.info(f"[Product] Testing image URL accessibility: {image_url}")
-                headers = {
-                    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-                    'Accept': 'image/webp,image/apng,image/*,*/*;q=0.8',
-                    'Accept-Language': 'en-US,en;q=0.9',
-                    'Accept-Encoding': 'gzip, deflate, br',
-                    'Connection': 'keep-alive',
-                    'Upgrade-Insecure-Requests': '1'
-                }
-                test_response = requests.get(image_url, headers=headers, timeout=10, stream=True, allow_redirects=True)
-                if test_response.status_code != 200:
-                    logger.warning(f"[Product] Image URL not accessible (status {test_response.status_code}): {image_url}")
-                    raise Exception(f"Image URL not accessible: {test_response.status_code}")
-                logger.info(f"[Product] Image URL is accessible")
-            except Exception as e:
-                logger.warning(f"[Product] Failed to test image URL {image_url}: {e}")
-                image_url = None
-            # Send using public URL (not local file)
-            if image_url:
-                logger.info(f"[Product] Attempting to send image from CSV URL for: {product_name}")
-                success = send_whatsjet_message(
-                    from_number,
-                    details,
-                    media_type=media_type,
-                    media_path=image_url,  # Use public URL directly
-                    filename=filename
-                )
-                if success:
-                    logger.info(f"[Product] Successfully sent image from CSV link with caption for product: {product_name}")
-                    return
-                else:
-                    logger.warning(f"[Product] Failed to send image from CSV link, trying fallback: {product_name}")
-        # Fallback 1: Try with a known public test image
-        logger.info(f"[Product] Trying public test image for: {product_name}")
-        test_image_url = "https://www.w3schools.com/w3images/lights.jpg"
-        media_type = 'image/jpeg'
-        filename = f"{product_name.replace(' ', '_')}.jpg"
-        success = send_whatsjet_message(
-            from_number,
-            details,
-            media_type=media_type,
-            media_path=test_image_url,
-            filename=filename
-        )
-        if success:
-            logger.info(f"[Product] Successfully sent test image with caption for product: {product_name}")
-            return
-        # Fallback 2: Try local uploads directory (public URL)
-        logger.info(f"[Product] Trying local uploads directory for: {product_name}")
-        image_path = get_product_image_path(product_name)
-        if image_path:
-            media_type = get_product_image_media_type(image_path)
-            filename = f"{product_name.replace(' ', '_')}.jpg"
-            # If it's a public URL, send as image+caption
-            if image_path.startswith('http'):
-                logger.info(f"[Product] Sending normalized cPanel public URL with caption: {image_path}")
-                # Send image first using the correct method for URLs
-                image_success = send_whatsjet_media_image_only(
-                    from_number,
-                    image_path,
-                    filename=filename
-                )
-                if image_success:
-                    logger.info(f"[Product] Image sent successfully, now sending product details")
-                    # Send product details as text
-                    send_whatsjet_message(from_number, details)
-                    return
-                else:
-                    logger.warning(f"[Product] Failed to send image, sending text only")
-                    send_whatsjet_message(from_number, details)
-                    return
-            # Otherwise, treat as local file
-            elif os.path.exists(image_path):
-                logger.info(f"[Product] Sending local file with caption: {image_path}")
-                send_whatsjet_message(
-                    from_number,
-                    details,
-                    media_type=media_type,
-                    media_path=image_path,
-                    filename=filename
-                )
-                return
-        # No image available, send text only
-        logger.info(f"[Product] No image available, sending text only for: {product_name}")
-        send_whatsjet_message(from_number, details)
-    except Exception as e:
-        logger.error(f"[Product] Error sending product image with caption: {e}")
-        logger.info(f"[Product] Falling back to text-only message for: {product_name}")
-        send_whatsjet_message(from_number, details)
-
 if __name__ == "__main__":
     # Load products data on startup
     load_products_data()