Update app.py

app.py

@@ -1720,27 +1720,21 @@ async def process_incoming_message(from_number: str, msg: dict):
         if not message_body:
             return
         
-        # Check for greetings with multilingual support
+        # 🎯 PRIORITY 1: Check for greetings FIRST (before any other processing)
         if is_greeting(message_body):
-            # Check if user is currently in AI chat mode - if so, don't trigger menu mode
-            if current_state == 'ai_chat_mode':
-                logger.info(f"[Process] Greeting detected in AI chat mode, treating as AI query: {message_body}")
-                # Treat greeting as a general query in AI chat mode
-                await handle_general_query_with_ai(from_number, message_body, user_context, reply_language)
-                return
-            else:
-                # Only trigger menu mode if not in AI chat mode
-                welcome_msg = generate_veterinary_welcome_message()
-                send_whatsjet_message(from_number, welcome_msg)
-                context_manager.update_context(
-                    from_number, 
-                    current_state='main_menu', 
-                    current_menu='main_menu', 
-                    current_menu_options=list(MENU_CONFIG['main_menu']['option_descriptions'].values())
-                )
-                return
+            logger.info(f"[Process] Greeting detected: '{message_body}' -> showing welcome message")
+            # Always show welcome message for greetings, regardless of current state
+            welcome_msg = generate_veterinary_welcome_message()
+            send_whatsjet_message(from_number, welcome_msg)
+            context_manager.update_context(
+                from_number, 
+                current_state='main_menu', 
+                current_menu='main_menu', 
+                current_menu_options=list(MENU_CONFIG['main_menu']['option_descriptions'].values())
+            )
+            return
         
-        # 🎯 PRIORITY 1: Navigation commands - work from ANY state
+        # 🎯 PRIORITY 2: Navigation commands - work from ANY state
         # Check for "main" command - now works for both text and voice
         if current_state != 'main_menu' and current_state != 'ai_chat_mode':  # Only check for main if not already in main menu and not in AI chat mode
             mapped_navigation = process_intelligent_voice_command(message_body, current_state, user_context)
@@ -1768,7 +1762,7 @@ async def process_incoming_message(from_number: str, msg: dict):
             )
             return
         
-        # 🎯 PRIORITY 2: State-specific handling (contact_request, availability_request, ai_chat_mode)
+        # 🎯 PRIORITY 3: State-specific handling (contact_request, availability_request, ai_chat_mode)
         if current_state == 'contact_request':
             await handle_contact_request_response(from_number, message_body)
             return
@@ -1779,7 +1773,7 @@ async def process_incoming_message(from_number: str, msg: dict):
             await handle_ai_chat_mode(from_number, message_body, reply_language)
             return
         
-        # 🎯 PRIORITY 3: Menu selections - check if this is a valid menu selection for current state
+        # 🎯 PRIORITY 4: Menu selections - check if this is a valid menu selection for current state
         if current_state in ['main_menu', 'category_selection_menu', 'category_products_menu', 'all_products_menu', 'product_inquiry', 'intelligent_products_menu']:
             # Validate menu selection
             is_valid, error_msg = validate_menu_selection(message_body, current_state, user_context)
@@ -1886,21 +1880,21 @@ async def process_incoming_message(from_number: str, msg: dict):
                         return
                 return  # Exit after handling menu selection
         
-        # 🎯 PRIORITY 4: Check for company/about queries first (before product search)
+        # 🎯 PRIORITY 5: Check for company/about queries first (before product search)
         query_lower = message_body.lower().strip()
         if any(keyword in query_lower for keyword in ['apex', 'company', 'about', 'who', 'what is']):
             # Use OpenAI for company information
             await handle_general_query_with_ai(from_number, message_body, user_context, reply_language)
             return
         
-        # 🎯 PRIORITY 5: Check for product-specific questions (mode of action, dosage, etc.)
+        # 🎯 PRIORITY 6: Check for product-specific questions (mode of action, dosage, etc.)
         product_question_keywords = ['mode of action', 'dosage', 'administration', 'composition', 'indications', 'precautions', 'storage', 'how to use', 'side effects']
         if any(keyword in query_lower for keyword in product_question_keywords):
             # Use OpenAI for product-specific questions
             await handle_general_query_with_ai(from_number, message_body, user_context, reply_language)
             return
         
-        # 🎯 PRIORITY 6: Product names - works from ANY menu state
+        # 🎯 PRIORITY 7: Product names - works from ANY menu state
         # This ensures users can say product names like "hydropex", "respira aid plus", etc. from any menu
         logger.info(f"[Process] Checking for product name in message: '{message_body}' from state: {current_state}")
         products = get_veterinary_product_matches(message_body)
@@ -1995,7 +1989,7 @@ async def process_incoming_message(from_number: str, msg: dict):
             # Simple one-liner for wrong queries
             send_whatsjet_message(from_number, "❌ Please correct your question or type 'main' to go to main menu.")
             
-        # 🎯 PRIORITY 7: Default: treat as general query with intelligent product inquiry
+        # 🎯 PRIORITY 8: 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:
@@ -2369,7 +2363,7 @@ def is_greeting(text):
         'night': ['night', 'nite', 'nyt'],
         'how_are_you': ['how are you', 'how r u', 'how are u', 'how r you', 'howru', 'howru'],
         'whats_up': ['whats up', 'whats up', 'what is up', 'wassup', 'wassup', 'sup', 'sup'],
-        'assalamu_alaikum': ['assalamu alaikum', 'assalam alaikum', 'assalamu alaikom', 'assalam alaikom', 'asalamu alaikum', 'asalam alaikum'],
+        'assalamu_alaikum': ['assalamu alaikum', 'assalam alaikum', 'assalamu alaikom', 'assalam alaikom', 'asalamu alaikum', 'asalam alaikum', 'as-salamu alaykum', 'as salam alaykum', 'assalamu alaykum', 'assalam alaykum'],
         'salam': ['salam', 'salaam', 'assalam', 'assalaam', 'salaam alaikum', 'salaam alaikom'],
         'adaab': ['adaab', 'adaab arz hai', 'adaab arz', 'adaab arz karta hun'],
         'namaste': ['namaste', 'namaskar', 'pranam', 'pranaam'],
@@ -2393,7 +2387,7 @@ def is_greeting(text):
         r'^(morning|afternoon|evening|night|mornin|morn|aftrnoon|aftr|evnin|evn|nite|nyt)\s*$',
         r'^(how\s+(are\s+)?(you|u|r\s+u)|howru|howru)\s*$',
         r'^(whats?\s+up|wassup|sup)\s*$',
-        r'^(assalamu?\s+alaik(um|om)|asalamu?\s+alaik(um|om)|salaam\s+alaik(um|om))\s*$',
+        r'^(assalamu?\s+alaik(um|om)|asalamu?\s+alaik(um|om)|salaam\s+alaik(um|om)|as-salamu?\s+alaykum|as\s+salam\s+alaykum)\s*$',
         r'^(salam|salaam|assalam|assalaam)\s*$',
         r'^(adaab(?:\s+arz(?:\s+(hai|karta\s+hun))?)?)\s*$',
         r'^(namaste|namaskar|pranam|pranaam)\s*$',