Update app.py

app.py

@@ -2313,20 +2313,15 @@ async def process_incoming_message(from_number: str, msg: dict):
                             current_menu='product_inquiry',
                             current_menu_options=list(MENU_CONFIG['product_inquiry']['option_descriptions'].values())
                         )
-                        await send_product_image_with_caption(from_number, selected_product, user_context, reply_language)
+                        await send_product_image_with_caption(from_number, selected_product, user_context)
                     else:
                         send_whatsjet_message(from_number, get_menu_validation_message(current_state, user_context))
                 elif current_state == 'all_products_menu':
                     # Handle product selection from all products
-                    available_products = user_context.get('available_products', [])
-                    if not available_products:
-                        # Fallback to products_df if available_products not set
-                        if products_df is not None and not products_df.empty:
-                            available_products = products_df.to_dict('records')
-                    
-                    if available_products:
-                        if message_body.isdigit() and 1 <= int(message_body) <= len(available_products):
-                            selected_product = available_products[int(message_body) - 1]
+                    if products_df is not None and not products_df.empty:
+                        all_products = products_df.to_dict('records')
+                        if message_body.isdigit() and 1 <= int(message_body) <= len(all_products):
+                            selected_product = all_products[int(message_body) - 1]
                             context_manager.update_context(
                                 from_number,
                                 current_product=selected_product,
@@ -2334,14 +2329,11 @@ async def process_incoming_message(from_number: str, msg: dict):
                                 current_menu='product_inquiry',
                                 current_menu_options=list(MENU_CONFIG['product_inquiry']['option_descriptions'].values())
                             )
-                            await send_product_image_with_caption(from_number, selected_product, user_context, reply_language)
-                            return  # Exit after handling product selection
+                            await send_product_image_with_caption(from_number, selected_product, user_context)
                         else:
                             send_whatsjet_message(from_number, get_menu_validation_message(current_state, user_context))
-                            return  # Exit after showing validation message
                     else:
                         send_whatsjet_message(from_number, "❌ No products available. Type 'main' to return to main menu.")
-                        return  # Exit after showing error message
                 elif current_state == 'product_inquiry':
                     await handle_veterinary_product_followup(message_body, from_number)
                 elif current_state == 'intelligent_products_menu':
@@ -2356,19 +2348,11 @@ async def process_incoming_message(from_number: str, msg: dict):
                             current_menu='product_inquiry',
                             current_menu_options=list(MENU_CONFIG['product_inquiry']['option_descriptions'].values())
                         )
-                        await send_product_image_with_caption(from_number, selected_product, user_context, reply_language)
+                        await send_product_image_with_caption(from_number, selected_product, user_context)
                         return
                     else:
-                        # Check if the invalid input might be a product query
-                        products = get_veterinary_product_matches(message_body)
-                        if products:
-                            logger.info(f"[Process] Invalid menu selection but product found: '{message_body}' -> Handling as product query")
-                            await handle_intelligent_product_inquiry(from_number, message_body, user_context, reply_language)
-                            return
-                        else:
-                            # Show menu validation message with guidance
-                            send_whatsjet_message(from_number, get_menu_validation_message(current_state, user_context))
-                            return
+                        send_whatsjet_message(from_number, get_menu_validation_message(current_state, user_context))
+                        return
                 return  # Exit after handling menu selection
         
         # 🎯 PRIORITY 6: Product names - works from ANY menu state
@@ -2376,21 +2360,18 @@ async def process_incoming_message(from_number: str, msg: dict):
         logger.info(f"[Process] Checking for product name in message: '{message_body}' from state: {current_state}")
         products = get_veterinary_product_matches(message_body)
 
-        # --- IMPROVED LOGIC: Check for exact product name match first ---
+        # --- NEW LOGIC: Check for exact match first ---
         normalized_input = normalize(message_body).lower().strip()
         exact_match = None
-        
-        # First, try to find exact product name match in the database
-        if products_df is not None and not products_df.empty:
-            for _, row in products_df.iterrows():
-                product_name = str(row.get('Product Name', '')).lower().strip()
-                normalized_product_name = normalize(product_name).lower().strip()
-                if normalized_product_name == normalized_input:
-                    exact_match = row.to_dict()
-                    logger.info(f"[Process] Exact product name match found: {exact_match.get('Product Name', 'Unknown')}")
-                    break
-        
+        for product in products:
+            product_name = product.get('Product Name', '')
+            normalized_product_name = normalize(product_name).lower().strip()
+            if normalized_product_name == normalized_input:
+                exact_match = product
+                break
+
         if exact_match:
+            logger.info(f"[Process] Exact product match found: {exact_match.get('Product Name', 'Unknown')}")
             context_manager.update_context(
                 from_number,
                 current_product=exact_match,
@@ -2399,7 +2380,7 @@ async def process_incoming_message(from_number: str, msg: dict):
                 current_menu_options=list(MENU_CONFIG['product_inquiry']['option_descriptions'].values())
             )
             # Only send one reply: image+caption if possible, else text
-            await send_product_image_with_caption(from_number, exact_match, user_context, reply_language)
+            await send_product_image_with_caption(from_number, exact_match, user_context)
             return
 
         # --- END NEW LOGIC ---
@@ -2432,7 +2413,7 @@ async def process_incoming_message(from_number: str, msg: dict):
                     current_menu='product_inquiry',
                     current_menu_options=list(MENU_CONFIG['product_inquiry']['option_descriptions'].values())
                 )
-                await send_product_image_with_caption(from_number, selected_product, user_context, reply_language)
+                await send_product_image_with_caption(from_number, selected_product, user_context)
                 return
             
             # If it's a category/symptom search with multiple products, show all products
@@ -2443,9 +2424,37 @@ async def process_incoming_message(from_number: str, msg: dict):
                 return
 
         else:
-            # Use intelligent product inquiry for all non-found queries
-            await handle_intelligent_product_inquiry(from_number, message_body, user_context, reply_language)
-            return
+            # Enhanced "not found" response with veterinary suggestions
+            message = (
+                "❌ *Product Not Found*\n\n"
+                f"🔍 *We couldn't find '{message_body}' in our veterinary database.*\n\n"
+                "💡 *Try these alternatives:*\n"
+                "• Check spelling (e.g., 'Hydropex' not 'Hydro pex')\n"
+                "• Search by symptoms (e.g., 'respiratory', 'liver support')\n"
+                "• Search by category (e.g., 'antibiotic', 'vitamin')\n"
+                "• Search by species (e.g., 'poultry', 'livestock')\n\n"
+                "🏥 *Popular Veterinary Products:*\n"
+                "• Hydropex (Electrolyte supplement)\n"
+                "• Heposel (Liver tonic)\n"
+                "• Bromacid (Respiratory support)\n"
+                "• Tribiotic (Antibiotic)\n"
+                "• Symodex (Multivitamin)\n\n"
+                "💬 *Type 'main' to return to main menu or try another search.*"
+            )
+            
+            # Translate response if needed
+            if reply_language == 'ur':
+                try:
+                    translated_message = GoogleTranslator(source='auto', target='ur').translate(message)
+                    send_whatsjet_message(from_number, translated_message)
+                except Exception as e:
+                    logger.error(f"[AI] Translation error: {e}")
+                    send_whatsjet_message(from_number, message)
+            else:
+                send_whatsjet_message(from_number, message)
+            
+        # 🎯 PRIORITY 5: Default: treat as general query with intelligent product inquiry
+        await handle_intelligent_product_inquiry(from_number, message_body, user_context, reply_language)
             
     except Exception as e:
         logger.error(f"Error in process_incoming_message: {e}")