Update app.py

app.py

@@ -2561,8 +2561,8 @@ load_products_data()
 
 def get_product_image_path(product_name: str) -> str:
     """
-    Get the public image URL for a product based on its name, robust to formatting, preserving dashes.
-    cPanel public URL format: https://amgocus.com/uploads/images/<normalized_name>.<ext>
+    Get the cPanel image URL for a product based on its name.
+    Only uses cPanel public URL format: https://amgocus.com/uploads/images/<normalized_name>.<ext>
     Normalized: lowercase, remove spaces/underscores/dots, preserve dashes.
     """
     try:
@@ -2572,37 +2572,29 @@ def get_product_image_path(product_name: str) -> str:
         logger.info(f"[Image] Normalized product name: '{product_name}' -> '{normalized_name}'")
         image_extensions = ['.png', '.jpg', '.jpeg', '.webp']
         base_url = "https://amgocus.com/uploads/images/"
-        # Log for all normalized checks
+        
+        # Check for all possible extensions
         for ext in image_extensions:
             image_url = f"{base_url}{normalized_name}{ext}"
-            logger.info(f"[Image] Checking normalized image URL: {image_url}")
-            # For public URLs, assume they are accessible if they start with http
+            logger.info(f"[Image] Checking cPanel image URL: {image_url}")
+            # For cPanel URLs, assume they are accessible if they start with http
             if image_url.startswith('http'):
-                # Optionally, you could check with requests.get here, but we trust browser accessibility
-                if product_name.lower().replace(' ', '').replace('_', '').replace('.', '') == 'b-gaspro-c':
-                    logger.info(f"[Image] Special debug: Checking for B-G Aspro-C at {image_url}")
-                # If you want to verify with requests, uncomment below:
-                # try:
-                #     resp = requests.get(image_url, timeout=5, stream=True)
-                #     if resp.status_code == 200:
-                #         logger.info(f"[Image] Found public image URL: {image_url}")
-                #         return image_url
-                # except Exception as e:
-                #     logger.warning(f"[Image] Error checking image URL {image_url}: {e}")
-                logger.info(f"[Image] Found public image URL: {image_url}")
+                logger.info(f"[Image] Found cPanel image URL: {image_url}")
                 return image_url
+        
         # Fallback: try original name with spaces as %20
         safe_name = product_name.strip().replace(' ', '%20')
         for ext in image_extensions:
             image_url = f"{base_url}{safe_name}{ext}"
-            logger.info(f"[Image] Checking fallback image URL: {image_url}")
+            logger.info(f"[Image] Checking fallback cPanel image URL: {image_url}")
             if image_url.startswith('http'):
-                logger.info(f"[Image] Found public image URL (legacy): {image_url}")
+                logger.info(f"[Image] Found cPanel image URL (fallback): {image_url}")
                 return image_url
-        logger.warning(f"[Image] No public image found for product: {product_name}")
+        
+        logger.warning(f"[Image] No cPanel image found for product: {product_name}")
         return None
     except Exception as e:
-        logger.error(f"[Image] Error generating public image URL for {product_name}: {e}")
+        logger.error(f"[Image] Error generating cPanel image URL for {product_name}: {e}")
         return None
 
 def get_product_image_media_type(image_path: str) -> str:
@@ -2782,44 +2774,25 @@ def ensure_images_dir():
 async def send_product_image_with_caption(from_number: str, product: Dict[str, Any], user_context: Dict[str, Any]):
     """
     Send product image (if available) with product details as caption in a single WhatsApp message.
+    Only uses cPanel images from https://amgocus.com/uploads/images/
     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}")
+    logger.info(f"[Product] Processing cPanel image for product: {product_name}")
     
     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"
+        # Get cPanel image URL for the product
+        image_url = get_product_image_path(product_name)
+        
+        if image_url and image_url.startswith('http'):
+            logger.info(f"[Product] Found cPanel image URL: {image_url}")
             
-            # Test the image URL first
+            # Test if the cPanel image URL is accessible
             try:
-                logger.info(f"[Product] Testing image URL accessibility: {image_url}")
+                logger.info(f"[Product] Testing cPanel 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',
@@ -2830,81 +2803,36 @@ async def send_product_image_with_caption(from_number: str, product: Dict[str, A
                 }
                 test_response = requests.head(image_url, headers=headers, timeout=10, 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")
+                    logger.warning(f"[Product] cPanel image URL not accessible (status {test_response.status_code}): {image_url}")
+                    raise Exception(f"cPanel image URL not accessible: {test_response.status_code}")
+                logger.info(f"[Product] cPanel image URL is accessible")
             except Exception as e:
-                logger.warning(f"[Product] Failed to test image URL {image_url}: {e}")
+                logger.warning(f"[Product] Failed to test cPanel image URL {image_url}: {e}")
                 image_url = None
             
-            # Send using public URL (not local file)
+            # Send using cPanel URL
             if image_url:
-                logger.info(f"[Product] Attempting to send image from CSV URL for: {product_name}")
+                logger.info(f"[Product] Attempting to send cPanel image for: {product_name}")
+                media_type = 'image/jpeg'
+                filename = f"{product_name.replace(' ', '_')}.jpg"
+                
                 success = send_whatsjet_message(
                     from_number,
                     details,
                     media_type=media_type,
-                    media_path=image_url,  # Use public URL directly
+                    media_path=image_url,  # Use cPanel URL directly
                     filename=filename
                 )
                 
                 if success:
-                    logger.info(f"[Product] Successfully sent image from CSV link with caption for product: {product_name}")
+                    logger.info(f"[Product] Successfully sent cPanel image 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
+                    logger.warning(f"[Product] Failed to send cPanel image, sending text only: {product_name}")
         
-        # 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 and (image_path.startswith('http') or os.path.exists(image_path)):
-            media_type = get_product_image_media_type(image_path)
-            filename = f"{product_name.replace(' ', '_')}.jpg"
-            
-            # If it's already a public URL, use it directly
-            if image_path.startswith('http'):
-                media_path = image_path
-                logger.info(f"[Product] Using existing public URL: {media_path}")
-            else:
-                # Convert local path to public URL
-                media_path = f"https://dreamstream-1-chatbot.hf.space/uploads/{os.path.basename(image_path).replace(' ', '%20')}"
-                logger.info(f"[Product] Converted local path to public URL: {media_path}")
-            
-            success = send_whatsjet_message(
-                from_number,
-                details,
-                media_type=media_type,
-                media_path=media_path,  # Use public URL
-                filename=filename
-            )
-            
-            if success:
-                logger.info(f"[Product] Successfully sent image with caption for product: {product_name}")
-            else:
-                logger.warning(f"[Product] Failed to send image, sending text only: {product_name}")
-                send_whatsjet_message(from_number, details)
-        else:
-            # 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)
+        # No cPanel image available, send text only
+        logger.info(f"[Product] No cPanel 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}")
@@ -2937,7 +2865,7 @@ async def test_product_image_with_caption(phone: str):
 
 # Test endpoint for image sending
 @app.get("/test-image-sending")
-async def test_image_sending(phone: str, image_url: str = "https://www.w3schools.com/w3images/lights.jpg"):
+async def test_image_sending(phone: str, image_url: str = "https://amgocus.com/uploads/images/respiraaidplus.png"):
     """Test endpoint for sending images via WhatsApp"""
     try:
         filename = "test_image.jpg"
@@ -3055,13 +2983,6 @@ async def test_cpanel_image_access():
             "timestamp": datetime.now().isoformat()
         }
 
-def convert_drive_link(link: str) -> str:
-    """Convert Google Drive link to direct download link"""
-    if 'drive.google.com' in link:
-        file_id = link.split('/')[-2] if '/d/' in link else link.split('/')[-1]
-        return f"https://drive.google.com/uc?export=download&id={file_id}"
-    return link
-
 def format_number_with_emoji(number: int) -> str:
     """Format number with emoji"""
     emoji_map = {
@@ -3663,4 +3584,4 @@ 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)