Update app.py

app.py

@@ -129,7 +129,7 @@ MENU_CONFIG = {
         'name': 'Main Menu',
         'valid_options': ['1', '2', '3', '4'],
         'option_descriptions': {
-            '1': 'Search Products',
+            '1': 'Complete Products List',
             '2': 'Browse Categories', 
             '3': 'Download Catalog',
             '4': 'Chat with Veterinary AI Assistant'
@@ -1992,41 +1992,12 @@ async def process_incoming_message(from_number: str, msg: dict):
             
             # Handle valid menu selection
             if message_body == '1':
-                # Product Search
-                context_manager.update_context(
-                    from_number,
-                    current_state='product_inquiry',
-                    current_menu='product_inquiry',
-                    current_menu_options=['main'],
-                    reply_language=reply_language
-                )
-                if reply_language == 'ur':
-                    message = (
-                        "🔍 *پروڈکٹ سرچ*\n\n"
-                        "براہ کرم پروڈکٹ کا نام، زمرہ، یا علامات لکھیں:\n\n"
-                        "📝 *مثال:*\n"
-                        "• Hydropex\n"
-                        "• سانس کی بیماری\n"
-                        "• جگر کی صحت\n"
-                        "• اینٹی بائیوٹکس\n\n"
-                        "💬 'main' لکھ کر مین مینو پر واپس جائیں۔"
-                    )
-                else:
-                    message = (
-                        "🔍 *Product Search*\n\n"
-                        "Please enter a product name, category, or symptoms:\n\n"
-                        "📝 *Examples:*\n"
-                        "• Hydropex\n"
-                        "• Respiratory disease\n"
-                        "• Liver health\n"
-                        "• Antibiotics\n\n"
-                        "💬 Type 'main' to return to main menu"
-                    )
-                send_whatsjet_message(from_number, message)
+                # Complete Products List - Display all 23 products
+                await display_all_products(from_number)
                 return
                 
             elif message_body == '2':
-                # Category Browse
+                # Category Browse - Show all categories
                 categories = get_all_categories()
                 if reply_language == 'ur':
                     message = "📂 *زمرے براؤز کریں:*\n\n"
@@ -2045,6 +2016,7 @@ async def process_incoming_message(from_number: str, msg: dict):
                     current_state='category_selection',
                     current_menu='category_selection',
                     current_menu_options=categories,
+                    available_categories=categories,
                     reply_language=reply_language
                 )
                 return
@@ -2061,7 +2033,7 @@ async def process_incoming_message(from_number: str, msg: dict):
                     current_state='ai_chat_mode',
                     current_menu='ai_chat_mode',
                     current_menu_options=['main'],
-                    reply_language='ur'
+                    reply_language=reply_language
                 )
                 if reply_language == 'ur':
                     message = (
@@ -2091,7 +2063,34 @@ async def process_incoming_message(from_number: str, msg: dict):
             await handle_category_selection(message_body, from_number)
             return
         
-        # 🎯 PRIORITY 5: Product inquiry handling
+        # 🎯 PRIORITY 5: Individual product selection by number
+        elif current_state in ['all_products_menu', 'category_products_menu']:
+            # Handle product selection from numbered list
+            try:
+                selection_index = int(message_body) - 1
+                menu_options = user_context.get('current_menu_options', [])
+                available_products = user_context.get('available_products', [])
+                
+                if 0 <= selection_index < len(available_products):
+                    selected_product = available_products[selection_index]
+                    context_manager.update_context(from_number, current_product=selected_product)
+                    await send_product_with_image(from_number, selected_product, user_context)
+                    await handle_veterinary_product_followup(selected_product.get('Product Name', ''), from_number)
+                    return
+                else:
+                    # Invalid selection
+                    if reply_language == 'ur':
+                        send_whatsjet_message(from_number, f"❌ *غلط انتخاب۔ براہ کرم 1 سے {len(available_products)} کے درمیان نمبر منتخب کریں یا 'main' لکھ کر مین مینو پر واپس جائیں۔*")
+                    else:
+                        send_whatsjet_message(from_number, f"❌ *Invalid selection. Please choose a number between 1 and {len(available_products)}, or type 'main' to return to main menu.*")
+                    return
+                    
+            except ValueError:
+                # Not a number - treat as general query
+                await handle_general_query_with_ai(from_number, message_body, user_context, reply_language)
+                return
+        
+        # 🎯 PRIORITY 6: Product inquiry handling (for direct product searches)
         elif current_state == 'product_inquiry':
             # Check for voice commands first
             mapped_command = process_intelligent_voice_command(message_body, current_state, user_context)
@@ -2180,36 +2179,6 @@ async def process_incoming_message(from_number: str, msg: dict):
                 await handle_general_query_with_ai(from_number, message_body, user_context, reply_language)
                 return
         
-        # 🎯 PRIORITY 6: Product selection handling
-        elif current_state == 'product_selection':
-            # Handle product selection from list
-            try:
-                selection_index = int(message_body) - 1
-                menu_options = user_context.get('current_menu_options', [])
-                
-                if 0 <= selection_index < len(menu_options):
-                    selected_product_name = menu_options[selection_index]
-                    # Find the product in the database
-                    if products_df is not None and not products_df.empty:
-                        product_match = products_df[products_df['Product Name'].str.contains(selected_product_name, case=False, na=False)]
-                        if not product_match.empty:
-                            product = product_match.iloc[0].to_dict()
-                            context_manager.update_context(from_number, current_product=product)
-                            await send_product_with_image(from_number, product, user_context)
-                            await handle_veterinary_product_followup(selected_product_name, from_number)
-                            return
-                
-                # Invalid selection
-                if reply_language == 'ur':
-                    send_whatsjet_message(from_number, "❌ *غلط انتخاب۔ براہ کرم دوبارہ کوشش کریں یا 'main' لکھ کر مین مینو پر واپس جائیں۔*")
-                else:
-                    send_whatsjet_message(from_number, "❌ *Invalid selection. Please try again or type 'main' to return to main menu.*")
-                    
-            except ValueError:
-                # Not a number - treat as general query
-                await handle_general_query_with_ai(from_number, message_body, user_context, reply_language)
-                return
-        
         # 🎯 PRIORITY 7: All other queries - use OpenAI for intelligent response
         await handle_general_query_with_ai(from_number, message_body, user_context, reply_language)
         return