Update app.py

app.py

@@ -3816,9 +3816,13 @@ async def display_all_products(from_number: str):
         user_context = context_manager.get_context(from_number)
         current_state = user_context.get('current_state', 'main_menu')
         logger.info(f"[Display] display_all_products called for {from_number} in state: {current_state}")
+        if current_state == 'all_products_menu':
+            logger.warning(f"[Display] Already in all_products_menu state for {from_number}, skipping display")
+            return
         if products_df is None or products_df.empty:
             send_whatsjet_message(from_number, "❌ No products available at the moment.")
             return
+        # Set state to all_products_menu and store menu context
         products = products_df.to_dict('records')
         context_manager.update_context(
             from_number,
@@ -3828,6 +3832,7 @@ async def display_all_products(from_number: str):
             available_products=products
         )
         logger.info(f"[Display] Set state to all_products_menu for {from_number}")
+        # Send products in chunks
         chunk_size = 5
         for i in range(0, len(products), chunk_size):
             chunk = products[i:i + chunk_size]
@@ -3839,7 +3844,7 @@ async def display_all_products(from_number: str):
                 message += "\n"
             send_whatsjet_message(from_number, message)
         send_whatsjet_message(from_number, 
-            "💬 Type a product number to get detailed information, or type 'main' to return to main menu.")
+            "💬 Type a product name to get detailed information, or type 'main' to return to main menu.")
     except Exception as e:
         logger.error(f"[Display] Error displaying products: {e}")
         send_whatsjet_message(from_number, "❌ Error displaying products. Please try again.")
@@ -3897,111 +3902,80 @@ async def handle_category_selection(selection: str, from_number: str):
         send_helpful_guidance(from_number, 'category_selection_menu')
 
 def get_menu_validation_message(current_state: str, user_context: dict) -> str:
-    """Get professional validation message for current menu state"""
+    """Get appropriate validation message for current menu state"""
     if current_state == 'main_menu':
         return (
-            "⚠️ *Invalid Selection*\n\n"
-            "Please select a valid option from the main menu:\n\n"
-            "📋 *Available Options:*\n"
+            "❌ *Invalid Selection*\n\n"
+            "Please choose from the main menu:\n"
             "1️⃣ Search Veterinary Products\n"
             "2️⃣ Browse Categories\n"
             "3️⃣ Download Catalog\n"
             "4️⃣ Chat with Veterinary AI Assistant\n\n"
-            "💡 *Quick Actions:*\n"
+            "💬 *You can also:*\n"
             "• Type a product name (e.g., 'hydropex', 'respira aid plus')\n"
-            "• Type 'main' to refresh the menu\n"
-            "• Ask about symptoms or categories"
+            "• Type 'main' to refresh the menu"
         )
     elif current_state == 'all_products_menu':
         if products_df is not None and not products_df.empty:
             total_products = len(products_df)
             return (
-                f"⚠️ *Invalid Product Selection*\n\n"
+                f"❌ *Invalid Product Selection*\n\n"
                 f"Please choose a product number between 1 and {total_products}.\n\n"
-                "💡 *Alternative Options:*\n"
-                "• Type a specific product name (e.g., 'hydropex')\n"
-                "• Type 'main' to return to main menu\n"
-                "• Ask about product categories"
+                "💬 *You can also:*\n"
+                "• Type a product name (e.g., 'hydropex', 'respira aid plus')\n"
+                "• Type 'main' to return to main menu"
             )
         else:
-            return (
-                "⚠️ *No Products Available*\n\n"
-                "Currently no products are loaded in the system.\n\n"
-                "💡 *Please:*\n"
-                "• Type 'main' to return to main menu\n"
-                "• Contact support if this issue persists"
-            )
+            return "❌ No products available. Type 'main' to return to main menu."
     elif current_state == 'category_products_menu':
         available_products = user_context.get('available_products', [])
         if available_products:
             return (
-                f"⚠️ *Invalid Product Selection*\n\n"
+                f"❌ *Invalid Product Selection*\n\n"
                 f"Please choose a product number between 1 and {len(available_products)}.\n\n"
-                "💡 *Alternative Options:*\n"
-                "• Type a specific product name\n"
-                "• Type 'main' to return to main menu\n"
-                "• Browse other categories"
+                "💬 *You can also:*\n"
+                "• Type a product name (e.g., 'hydropex', 'respira aid plus')\n"
+                "• Type 'main' to return to main menu"
             )
         else:
-            return (
-                "⚠️ *No Products in Category*\n\n"
-                "This category currently has no available products.\n\n"
-                "💡 *Please:*\n"
-                "• Type 'main' to return to main menu\n"
-                "• Browse other categories\n"
-                "• Ask about specific products"
-            )
+            return "❌ No products available in this category. Type 'main' to return to main menu."
     elif current_state == 'category_selection_menu':
         available_categories = user_context.get('available_categories', [])
         if available_categories:
             return (
-                f"⚠️ *Invalid Category Selection*\n\n"
+                f"❌ *Invalid Category Selection*\n\n"
                 f"Please choose a category number between 1 and {len(available_categories)}.\n\n"
-                "💡 *Alternative Options:*\n"
-                "• Type a specific product name\n"
-                "• Type 'main' to return to main menu\n"
-                "• Ask about product types"
+                "💬 *You can also:*\n"
+                "• Type a product name (e.g., 'hydropex', 'respira aid plus')\n"
+                "• Type 'main' to return to main menu"
             )
         else:
-            return (
-                "⚠️ *No Categories Available*\n\n"
-                "Currently no product categories are available.\n\n"
-                "💡 *Please:*\n"
-                "• Type 'main' to return to main menu\n"
-                "• Ask about specific products\n"
-                "• Contact support if needed"
-            )
+            return "❌ No categories available. Type 'main' to return to main menu."
     elif current_state == 'product_inquiry':
         return (
-            "⚠️ *Invalid Selection*\n\n"
-            "Please choose a valid option for this product:\n\n"
-            "📋 *Available Actions:*\n"
+            "❌ *Invalid Selection*\n\n"
+            "Please choose an option:\n"
             "1️⃣ Talk to Veterinary Consultant\n"
             "2️⃣ Inquire About Availability\n"
             "3️⃣ Back to Main Menu\n\n"
-            "💡 *Alternative Options:*\n"
-            "• Type another product name\n"
-            "• Type 'main' to return to main menu\n"
-            "• Ask about related products"
+            "💬 *You can also:*\n"
+            "• Type a product name (e.g., 'hydropex', 'respira aid plus')\n"
+            "• Type 'main' to return to main menu"
         )
     elif current_state == 'intelligent_products_menu':
-        available_products = user_context.get('available_products', [])
         return (
-            f"⚠️ *Invalid Product Selection*\n\n"
-            f"Please choose a product number between 1 and {len(available_products)}.\n\n"
-            "💡 *Alternative Options:*\n"
-            "• Type a specific product name\n"
-            "• Type 'main' to return to main menu\n"
-            "• Ask about different categories"
+            "❌ *Invalid Selection*\n\n"
+            "Please choose a product number between 1 and {len(available_products)}.\n\n"
+            "💬 *You can also:*\n"
+            "• Type a product name (e.g., 'hydropex', 'respira aid plus')\n"
+            "• Type 'main' to return to main menu"
         )
     else:
         return (
-            "⚠️ *Invalid Selection*\n\n"
+            "❌ *Invalid Selection*\n\n"
             "Please choose a valid option or type 'main' to return to main menu.\n\n"
-            "💡 *Helpful Options:*\n"
-            "• Type a product name (e.g., 'hydropex', 'respira aid plus')\n"
-            "• Type 'main' to return to main menu\n"
-            "• Ask about veterinary products or categories"
+            "💬 *You can also:*\n"
+            "• Type a product name (e.g., 'hydropex', 'respira aid plus')"
         )
 
 def is_valid_menu_selection(selection: str, current_state: str, user_context: dict) -> bool:
@@ -4009,39 +3983,6 @@ def is_valid_menu_selection(selection: str, current_state: str, user_context: di
     is_valid, _ = validate_menu_selection(selection, current_state, user_context)
     return is_valid
 
-def get_irrelevant_query_response(query: str, current_state: str, reply_language: str = 'en') -> str:
-    """Get professional response for irrelevant or unclear queries"""
-    if reply_language == 'ur':
-        return (
-            "🤖 *Apex Biotical Veterinary Assistant*\n\n"
-            "آپ کا سوال واضح نہیں ہے یا یہ ویٹرنری مصنوعات سے متعلق نہیں ہے۔\n\n"
-            "💡 *میں آپ کی مدد کر سکتا ہوں:*\n"
-            "• ویٹرنری مصنوعات کے بارے میں معلومات\n"
-            "• مصنوعات کی تلاش اور براؤز\n"
-            "• ویٹرنری مشورے اور رہنمائی\n"
-            "• مصنوعات کی دستیابی کے بارے میں پوچھنا\n\n"
-            "📋 *مثال کے طور پر:*\n"
-            "• 'hydropex کے بارے میں بتائیں'\n"
-            "• 'سانس کی مصنوعات کون سی ہیں؟'\n"
-            "• 'main' لکھ کر مین مینو پر جائیں"
-        )
-    else:
-        return (
-            "🤖 *Apex Biotical Veterinary Assistant*\n\n"
-            "I'm here to help you with veterinary products and information. "
-            "Your query doesn't seem to be related to our veterinary services.\n\n"
-            "💡 *I can help you with:*\n"
-            "• Information about veterinary products\n"
-            "• Product search and browsing\n"
-            "• Veterinary advice and guidance\n"
-            "• Product availability inquiries\n\n"
-            "📋 *Examples of what you can ask:*\n"
-            "• 'Tell me about hydropex'\n"
-            "• 'What respiratory products do you have?'\n"
-            "• 'Show me all antibiotics'\n"
-            "• Type 'main' to return to main menu"
-        )
-
 def generate_veterinary_welcome_message(phone_number=None, user_context=None):
     """Generate veterinary welcome message"""
     return (
@@ -4072,11 +4013,6 @@ async def handle_veterinary_product_followup(selection: str, from_number: str) -
             send_whatsjet_message(from_number, "❌ No product selected. Please search for a product first.")
             return
         
-        # Validate that the selection is a valid follow-up option (1, 2, or 3)
-        if selection not in ['1', '2', '3']:
-            send_whatsjet_message(from_number, "❌ Invalid selection. Please choose 1, 2, or 3.")
-            return
-        
         if selection == '1':
             # Talk to Veterinary Consultant
             product_name = current_product.get('Product Name', 'the selected product')
@@ -4096,11 +4032,9 @@ async def handle_veterinary_product_followup(selection: str, from_number: str) -
                 current_menu='contact_request',
                 current_menu_options=['Provide contact details']
             )
-            
         elif selection == '2':
             # Inquire about Product Availability
             await handle_availability_inquiry(from_number, user_context)
-            
         elif selection == '3':
             welcome_msg = generate_veterinary_welcome_message(from_number, user_context)
             send_whatsjet_message(from_number, welcome_msg)
@@ -4111,6 +4045,9 @@ async def handle_veterinary_product_followup(selection: str, from_number: str) -
                 current_menu_options=list(MENU_CONFIG['main_menu']['option_descriptions'].values())
             )
             return
+        else:
+            send_whatsjet_message(from_number, "❌ Invalid selection. Please choose 1, 2, or 3.")
+            return
     except Exception as e:
         logger.error(f"Error in product follow-up: {e}")
         user_context = context_manager.get_context(from_number)